diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-23 09:47:01 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-23 09:47:01 -0700 |
| commit | 1a2e6ac10dbdb3984b4f651ffb042a22269e26c5 (patch) | |
| tree | f86a718f6f48906a601fef3fd04e761bdd1a4771 /.gitmodules | |
| parent | 3c09810ac95d7aac9eb13e09ae6c59a68fc1217e (diff) | |
| parent | 942c264861dedd8020fc18d65933e8f4f57e3e46 (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 92d5ac3e4f..fb79d5cbd5 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 |