diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-07-19 15:35:17 -0700 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-19 15:35:17 -0700 |
commit | b4e70366c6b25d1127e66fd28c6256b19467dd9b (patch) | |
tree | 7f51ee747a9ed1200899b1c3e19752d85ce878ed /build.json | |
parent | d82d0b295b51e1385481be381eef325423441a65 (diff) | |
parent | 0c2f1626c0082ab91aed27f77bbe01008d878db2 (diff) |
Merge branch 'decompression' of https://github.com/dgquintas/grpc into dgquintas-decompression
Conflicts:
Makefile
vsprojects/Grpc.mak
Diffstat (limited to 'build.json')
-rw-r--r-- | build.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build.json b/build.json index af8bd54460..2755703e1c 100644 --- a/build.json +++ b/build.json @@ -115,6 +115,7 @@ "src/core/channel/channel_args.h", "src/core/channel/channel_stack.h", "src/core/channel/client_channel.h", + "src/core/channel/compress_filter.h", "src/core/channel/connected_channel.h", "src/core/channel/context.h", "src/core/channel/http_client_filter.h", @@ -211,6 +212,7 @@ "src/core/channel/channel_args.c", "src/core/channel/channel_stack.c", "src/core/channel/client_channel.c", + "src/core/channel/compress_filter.c", "src/core/channel/connected_channel.c", "src/core/channel/http_client_filter.c", "src/core/channel/http_server_filter.c", |