diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-03 01:12:14 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-03 01:27:46 +0100 |
| commit | 89d8ed1b9138529dac0cc79ccc8525b42f3db3d3 (patch) | |
| tree | 89a0e7caef6a477ed9e00696712aa0ee67a33beb /package.json | |
| parent | 8696d577d680deec004c1cd0a8826a2e33a83c36 (diff) | |
| parent | ac1ac3ab3db628f7643532b515f62d113dcb9700 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable
Conflicts:
BUILD
Makefile
binding.gyp
build.yaml
gRPC.podspec
grpc.gemspec
package.json
src/python/grpcio/grpc_core_dependencies.py
templates/Makefile.template
tools/doxygen/Doxyfile.core.internal
tools/run_tests/sources_and_headers.json
vsprojects/vcxproj/gpr/gpr.vcxproj
vsprojects/vcxproj/gpr/gpr.vcxproj.filters
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json index 3b879385f9..7ab4ea514b 100644 --- a/package.json +++ b/package.json @@ -471,6 +471,7 @@ "src/core/support/time_precise.c", "src/core/support/time_win32.c", "src/core/support/tls_pthread.c", + "src/core/support/wrap_memcpy.c", "src/core/census/context.c", "src/core/census/initialize.c", "src/core/census/operation.c", |