diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:52:53 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:52:53 -0700 |
| commit | 547fed4e8b0b8e2390498b748ee49a033e5039ae (patch) | |
| tree | f8ed878185575bab8eccb606be76b0384f62cb28 /templates | |
| parent | cf531785495330c86ce2531d2ec5dbff9da680c6 (diff) | |
| parent | 772187cdf0ff9dfafd2e693474c51eeddfe4c800 (diff) | |
Merge github.com:grpc/grpc into footprints-on-the-sands-of-time
Conflicts:
src/core/channel/client_setup.c
src/core/surface/init.c
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/BUILD.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/BUILD.template b/templates/BUILD.template index dffdc1dddd..4e9d8c376a 100644 --- a/templates/BUILD.template +++ b/templates/BUILD.template @@ -1,5 +1,5 @@ # GRPC Bazel BUILD file. -# This currently builds C and C++ code. +# This currently builds C, C++ and Objective-C code. # This file has been automatically generated from a template file. # Please look at the templates directory instead. # This file can be regenerated from the template by running |