aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/src/core
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-03-28 20:21:43 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-03-28 20:21:43 +0200
commit1bb17d31cd00d70048c51c99ed5a827ea10389e6 (patch)
tree7896eefe6e037be157efcade7db989b113130126 /templates/src/core
parent367e5d896b115413f278b239dd63194cb3671c17 (diff)
parente5cc05b5c6cee7026a0d28d39925621451506820 (diff)
Merge branch 'master' of https://github.com/grpc/grpc into gpr_malloc_is_all
Diffstat (limited to 'templates/src/core')
-rw-r--r--templates/src/core/lib/surface/version.c.template (renamed from templates/src/core/surface/version.c.template)0
1 files changed, 0 insertions, 0 deletions
diff --git a/templates/src/core/surface/version.c.template b/templates/src/core/lib/surface/version.c.template
index f2b3cfdc58..f2b3cfdc58 100644
--- a/templates/src/core/surface/version.c.template
+++ b/templates/src/core/lib/surface/version.c.template