diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
| commit | e0d581b6ad1023635598d9de95bd951cd04b0354 (patch) | |
| tree | a0601b1315a1dc7b499998a95adba61322825f3c /gRPC.podspec | |
| parent | 658b6087cc07f8706d270ee0e31f28bbf732ec3d (diff) | |
| parent | 3e5d61670e23b040ed47b2df1e4c87ee2cfec4aa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# include/grpc++/client_context.h
# include/grpc++/server_context.h
# src/cpp/client/client_context.cc
# src/cpp/server/server_context.cc
# vsprojects/Grpc.mak
Diffstat (limited to 'gRPC.podspec')
| -rw-r--r-- | gRPC.podspec | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index ed9915d8c3..5c9089eb9d 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -64,6 +64,7 @@ Pod::Spec.new do |s| ss.source_files = 'src/core/support/env.h', 'src/core/support/file.h', 'src/core/support/murmur_hash.h', + 'src/core/support/stack_lockfree.h', 'src/core/support/grpc_string.h', 'src/core/support/string_win32.h', 'src/core/support/thd_internal.h', @@ -118,6 +119,7 @@ Pod::Spec.new do |s| 'src/core/support/murmur_hash.c', 'src/core/support/slice.c', 'src/core/support/slice_buffer.c', + 'src/core/support/stack_lockfree.c', 'src/core/support/string.c', 'src/core/support/string_posix.c', 'src/core/support/string_win32.c', @@ -359,6 +361,7 @@ Pod::Spec.new do |s| 'src/core/surface/server_chttp2.c', 'src/core/surface/server_create.c', 'src/core/surface/surface_trace.c', + 'src/core/surface/version.c', 'src/core/transport/chttp2/alpn.c', 'src/core/transport/chttp2/bin_encoder.c', 'src/core/transport/chttp2/frame_data.c', @@ -391,6 +394,7 @@ Pod::Spec.new do |s| ss.private_header_files = 'src/core/support/env.h', 'src/core/support/file.h', 'src/core/support/murmur_hash.h', + 'src/core/support/stack_lockfree.h', 'src/core/support/string.h', 'src/core/support/string_win32.h', 'src/core/support/thd_internal.h', |