diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-05-06 03:15:57 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-05-06 03:15:57 +0200 |
| commit | 19c46c37691948a0e21814eea5e7028d5bdc0de7 (patch) | |
| tree | d3dae633028416e802c3ea9ddb566a60f66b40a1 /test/core/surface | |
| parent | acae9fe6e74eb0bb55c87a8046c1cdd6bf83f32a (diff) | |
| parent | 24ccbed700aa4ac77a9c8ff4f6004f935d7b0344 (diff) | |
Merge remote-tracking branch 'google/release-0_14'
Conflicts:
Makefile
build.yaml
package.json
src/core/lib/surface/version.c
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/build_packages.bat
src/node/tools/package.json
src/python/grpcio/grpc_version.py
src/ruby/lib/grpc/version.rb
src/ruby/tools/version.rb
tools/distrib/python/grpcio_tools/grpc_version.py
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'test/core/surface')
0 files changed, 0 insertions, 0 deletions