diff options
| author |  yang-g <yangg@google.com> | 2016-07-12 08:33:39 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-07-12 08:33:39 -0700 |
| commit | 408ef6bf25bac1e1d45f39af4e031ac16d1699b6 (patch) | |
| tree | d07e130c7cacd511230ede6a61b8bc85171c1a82 /.gitmodules | |
| parent | 9241c6947fa924b6d961d2e90e1a4f7293ec727e (diff) | |
| parent | 2f17797c943b2b58865713b1ffd18e586d3fed02 (diff) | |
Merge remote-tracking branch 'upstream/master' into sequential_con
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index c85a53943a..ce647f3c45 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 = v3.0.0-beta-2 + branch = 3.0.0-beta-3 [submodule "third_party/gflags"] path = third_party/gflags url = https://github.com/gflags/gflags.git |