aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitmodules
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2016-11-08 10:56:16 -0800
committerGravatar Yuchen Zeng <zyc@google.com>2016-11-08 10:56:16 -0800
commitbd363544fd5d4d722c068b0ffc0991d7ea6a9277 (patch)
tree176fea48dc15ac859b2191fa1d57d4ce33e4a3a0 /.gitmodules
parentcc8b841832bba537aaf1c3a6e6dffb91894fe138 (diff)
parent24ef07c8afc8d59d9cfe67008bcd2d040467ff20 (diff)
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index ed71e23d51..513d6f3caf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,3 +21,6 @@
[submodule "third_party/thrift"]
path = third_party/thrift
url = https://github.com/apache/thrift.git
+[submodule "third_party/google_benchmark"]
+ path = third_party/google_benchmark
+ url = https://github.com/google/benchmark