diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
| commit | 8a187099ec8accf4f4b9c1bcea0a71d023f6389b (patch) | |
| tree | ae197d56afaf80aff6a1cb6dba715dba665572bf /src/core/transport/chttp2/stream_encoder.h | |
| parent | d7d9ce27c523798384051246e18e3f00b29dd8c9 (diff) | |
| parent | f8c63562c1388262c5588e381c05cb0c02e5b406 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# gRPC.podspec
# src/core/surface/call.c
# src/core/transport/chttp2/frame_data.c
# tools/doxygen/Doxyfile.core.internal
# vsprojects/Grpc.mak
Diffstat (limited to 'src/core/transport/chttp2/stream_encoder.h')
| -rw-r--r-- | src/core/transport/chttp2/stream_encoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/transport/chttp2/stream_encoder.h b/src/core/transport/chttp2/stream_encoder.h index 50c58ad5ca..db52f2a0f6 100644 --- a/src/core/transport/chttp2/stream_encoder.h +++ b/src/core/transport/chttp2/stream_encoder.h @@ -90,4 +90,4 @@ void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, grpc_chttp2_hpack_compressor *compressor, gpr_slice_buffer *output); -#endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STREAM_ENCODER_H */ +#endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STREAM_ENCODER_H */ |