diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-12-24 19:36:38 +0100 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-12-24 19:36:38 +0100 |
| commit | 8974a6681c430357632f5da4cc98f88ac46fe9e9 (patch) | |
| tree | 4eac6f15496bf7609df6cc26b6703a051c3097aa /.gitmodules | |
| parent | 7052ac25e60e137514d9a201a86eeb9b29b03d24 (diff) | |
| parent | 7593cff337629ca179302ddf6ce2cbedbbbcab73 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 3bba11f65a..d5680d2ea8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,6 @@ [submodule "third_party/zlib"] path = third_party/zlib url = https://github.com/madler/zlib -[submodule "third_party/openssl"] - path = third_party/openssl - url = https://github.com/openssl/openssl.git - branch = OpenSSL_1_0_2-stable [submodule "third_party/protobuf"] path = third_party/protobuf url = https://github.com/google/protobuf.git @@ -15,6 +11,9 @@ [submodule "third_party/googletest"] path = third_party/googletest url = https://github.com/google/googletest.git +[submodule "third_party/boringssl"] + path = third_party/boringssl + url = https://boringssl.googlesource.com/boringssl [submodule "third_party/nanopb"] path = third_party/nanopb url = https://github.com/nanopb/nanopb.git |