Bump protobuf version to beta-3.3

It’s just the merge of beta-3.1 and beta-3.2, both of which we need.
pull/7219/head
Jorge Canizales 9 years ago
parent 0f213c399c
commit f29e364168
  1. 2
      .gitmodules
  2. 2
      examples/cpp/helloworld/Makefile
  3. 2
      examples/cpp/route_guide/Makefile
  4. 2
      third_party/protobuf

2
.gitmodules vendored

@ -4,7 +4,7 @@
[submodule "third_party/protobuf"]
path = third_party/protobuf
url = https://github.com/google/protobuf.git
branch = v3.0.0-beta-3.1
branch = 3.0.0-beta-3
[submodule "third_party/gflags"]
path = third_party/gflags
url = https://github.com/gflags/gflags.git

@ -97,7 +97,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
@echo "Please install Google protocol buffers 3.0.0 and its compiler."
@echo "You can find it here:"
@echo
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-2"
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-3.3"
@echo
@echo "Here is what I get when trying to evaluate your version of protoc:"
@echo

@ -86,7 +86,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
@echo "Please install Google protocol buffers 3.0.0 and its compiler."
@echo "You can find it here:"
@echo
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-2"
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-3.3"
@echo
@echo "Here is what I get when trying to evaluate your version of protoc:"
@echo

@ -1 +1 @@
Subproject commit d4d13a4349e4e59d67f311185ddcc1890d956d7a
Subproject commit bdeb215cab2985195325fcd5e70c3fa751f46e0f
Loading…
Cancel
Save