diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-06-30 15:37:11 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-06-30 15:37:11 -0700 |
| commit | c93d6a66a12110f82882807d95ad5dcb02370151 (patch) | |
| tree | efb5e632e8ad237e05d63af14e54c2a8d83ad87b /examples/cpp/README.md | |
| parent | 095172c3a52a11c42aed0150eb8dbb47186fd2a0 (diff) | |
| parent | a5596db1a53723789d7c90c23d9cbfbb8207f949 (diff) | |
Merge master into merge-0.14-into-master
Conflicts:
- gRPC.podspec
- Only had non-trivial changes in the core file list, which will need to be
regenerated (in gRPC-Core.podspec).
- src/objective-c/BoringSSL.podspec
- Had trivial conflicts in the version.
- src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
- Trivial conflicts in quoting.
- src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and
src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj
- The master version is used, pending testing. The 0.14 version had emoji and
some unneeded entries.
- src/objective-c/tests/Podfile
- Added CronetFramework pod, and warning silencing from master.
- templates/gRPC.podspec.template
- Deleted.
- third_party/protobuf
- Using master commit, but need to verify if it works for frameworks.
Diffstat (limited to 'examples/cpp/README.md')
| -rw-r--r-- | examples/cpp/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/cpp/README.md b/examples/cpp/README.md index d93cbacf7b..3fa7ad4c78 100644 --- a/examples/cpp/README.md +++ b/examples/cpp/README.md @@ -14,7 +14,7 @@ following command: ```sh -$ git clone https://github.com/grpc/grpc.git +$ git clone -b $(curl -L http://grpc.io/release) https://github.com/grpc/grpc ``` Change your current directory to examples/cpp/helloworld |