diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-11 21:00:08 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-11 21:00:08 +0200 |
| commit | 7f074e0e20872de5720d6f5f2e77d4add7bed84a (patch) | |
| tree | 72987b668b1bab3f4837cd073049ef4787048151 /examples/cpp | |
| parent | 2c779d64db4b4e460c697b59170f85135d552db5 (diff) | |
| parent | dae95b4e3608bbb4d012e10627fea6d2e74b48a0 (diff) | |
Merge branch 'v1.0.x' into manual-upmerge
Diffstat (limited to 'examples/cpp')
| -rw-r--r-- | examples/cpp/helloworld/Makefile | 2 | ||||
| -rw-r--r-- | examples/cpp/route_guide/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/cpp/helloworld/Makefile b/examples/cpp/helloworld/Makefile index df82f4688f..2c50b8208b 100644 --- a/examples/cpp/helloworld/Makefile +++ b/examples/cpp/helloworld/Makefile @@ -107,7 +107,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-3.3" + @echo " https://github.com/google/protobuf/releases/tag/v3.0.0" @echo @echo "Here is what I get when trying to evaluate your version of protoc:" @echo diff --git a/examples/cpp/route_guide/Makefile b/examples/cpp/route_guide/Makefile index ba5e45c05c..00cf9ad4e6 100644 --- a/examples/cpp/route_guide/Makefile +++ b/examples/cpp/route_guide/Makefile @@ -96,7 +96,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-3.3" + @echo " https://github.com/google/protobuf/releases/tag/v3.0.0" @echo @echo "Here is what I get when trying to evaluate your version of protoc:" @echo |