diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-03 13:24:13 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-03 13:24:13 -0700 |
| commit | 6988838a67479d2873fb724625cec28f1b0b5639 (patch) | |
| tree | dceb3aba7883ca7269ebbf8521ead56f49a5cf0f /.gitmodules | |
| parent | c87b77fb3d3c333f4bfc7e732410a4dae6beb4f3 (diff) | |
| parent | 9070ab6610bd8cd0dbe6922a049a3b094c908bd1 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 12956229c6..ed71e23d51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ [submodule "third_party/protobuf"] path = third_party/protobuf url = https://github.com/google/protobuf.git - branch = 3.0.0-GA + branch = 3.0.x [submodule "third_party/gflags"] path = third_party/gflags url = https://github.com/gflags/gflags.git @@ -14,9 +14,6 @@ [submodule "third_party/boringssl"] path = third_party/boringssl url = https://github.com/google/boringssl.git -[submodule "third_party/nanopb"] - path = third_party/nanopb - url = https://github.com/nanopb/nanopb.git [submodule "third_party/c-ares"] path = third_party/c-ares url = https://github.com/c-ares/c-ares.git |