diff options
| author |  Hongyu Chen <hongyu@google.com> | 2015-08-11 16:01:02 -0700 |
|---|---|---|
| committer | Hongyu Chen <hongyu@google.com> | 2015-08-11 16:01:02 -0700 |
| commit | e98551723a3787ee70982ad08b6b6563cadd281d (patch) | |
| tree | f5d2e46e2287db2b48a83deee399c2d9c9f32efe /Makefile | |
| parent | 7adbb643072af7b6dc0f09298fa44b988118df01 (diff) | |
| parent | 73578f7f62df4fd03035ad8e04c43b492649a064 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -313,7 +313,7 @@ E = @echo Q = @ endif -VERSION = 0.10.0.0 +VERSION = 0.10.1.0 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) @@ -4486,7 +4486,6 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/async_generic_service.h \ include/grpc++/async_unary_call.h \ include/grpc++/auth_context.h \ - include/grpc++/auth_property_iterator.h \ include/grpc++/byte_buffer.h \ include/grpc++/channel_arguments.h \ include/grpc++/channel_interface.h \ @@ -4730,7 +4729,6 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/async_generic_service.h \ include/grpc++/async_unary_call.h \ include/grpc++/auth_context.h \ - include/grpc++/auth_property_iterator.h \ include/grpc++/byte_buffer.h \ include/grpc++/channel_arguments.h \ include/grpc++/channel_interface.h \ |