diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-01-18 18:49:07 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-01-18 18:49:07 -0800 |
| commit | 04ec4701e303b8b41d90d5ce6861689c7f0fab7f (patch) | |
| tree | b37a55fead11bb07956718671aa1b1ed1bbb3991 /.gitmodules | |
| parent | b0023d25dc783ba77164c03a39bb7dcc7e446fe8 (diff) | |
| parent | 6da1dc87aa3384594e9ab6218b1e0886573108de (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 513d6f3caf..361696bc0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,6 +21,9 @@ [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 +[submodule "third_party/benchmark"] + path = third_party/benchmark url = https://github.com/google/benchmark +[submodule "third_party/boringssl-with-bazel"] + path = third_party/boringssl-with-bazel + url = https://boringssl.googlesource.com/boringssl |