diff options
| author | Muxi Yan <mxyan@google.com> | 2017-08-21 15:19:50 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-08-21 15:19:50 -0700 |
| commit | 7c62a35c6fcf9f1e3d66a012c7c4a14b30367052 (patch) | |
| tree | f9ef540ee26eee93b620486b85b9d3e57993cbed /Makefile | |
| parent | 219d9f52de57d701c1113f58bd2745a1d3107771 (diff) | |
| parent | d6cf6dea3677c753e27999d0f2f9695da78932f2 (diff) | |
| download | grpc-grpc-7c62a35c6fcf9f1e3d66a012c7c4a14b30367052.tar.gz | |
Merge remote-tracking branch 'upstream/master' into stream_compression_config
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -411,8 +411,8 @@ Q = @ endif CORE_VERSION = 4.0.0-dev -CPP_VERSION = 1.5.0-dev -CSHARP_VERSION = 1.5.0-dev +CPP_VERSION = 1.7.0-dev +CSHARP_VERSION = 1.7.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) |