diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-05-01 14:38:01 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-05-01 14:38:01 -0700 |
| commit | 46758c39101395a757a7883b4e8108b39193cafb (patch) | |
| tree | a2c34dcb33f4e623c6e6df6900773c8bf92d84fd /Makefile | |
| parent | 684d9b74f636b9504045948b4f397776d3a75c36 (diff) | |
| parent | 305dcf3d32bed0614325ead76f121702768ce874 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into trying-to-fix-stuff
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -5157,8 +5157,6 @@ PUBLIC_HEADERS_CXX += \ include/grpc/impl/codegen/sync_windows.h \ include/grpc++/impl/codegen/proto_utils.h \ include/grpc++/impl/codegen/config_protobuf.h \ - include/grpc++/impl/codegen/thrift_serializer.h \ - include/grpc++/impl/codegen/thrift_utils.h \ LIBGRPC++_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_TEST_UTIL_SRC)))) |