diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-16 11:16:34 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-16 11:16:34 -0700 |
| commit | e61bf3b406ae5705dafc76899eb84427961a686d (patch) | |
| tree | 958c605b213d1cba94b5f00540de224b446b1d24 /.gitmodules | |
| parent | 7ef54b662f7993e425e44c28362bbbc99d49ca18 (diff) | |
| parent | 6b38251f079556833de244c0ab08101e47b6f367 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 01b8fab98d..43e6447a69 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-beta-3 + branch = 3.0.0-GA [submodule "third_party/gflags"] path = third_party/gflags url = https://github.com/gflags/gflags.git |