Bringing 0.15 to protobuf beta 3.3 to satisfy both nodejs and objc.

pull/7341/head
Nicolas "Pixel" Noble 9 years ago
parent 4150e9e2f5
commit aa0b4c8084
  1. 2
      .gitmodules
  2. 2
      third_party/protobuf
  3. 2
      tools/run_tests/sanity/check_submodules.sh

2
.gitmodules vendored

@ -4,7 +4,7 @@
[submodule "third_party/protobuf"]
path = third_party/protobuf
url = https://github.com/google/protobuf.git
branch = v3.0.0-beta-3.1
branch = v3.0.0-beta-3.3
[submodule "third_party/gflags"]
path = third_party/gflags
url = https://github.com/gflags/gflags.git

@ -1 +1 @@
Subproject commit d4d13a4349e4e59d67f311185ddcc1890d956d7a
Subproject commit bdeb215cab2985195325fcd5e70c3fa751f46e0f

@ -45,7 +45,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
f8ac463766281625ad710900479130c7fcb4d63b third_party/nanopb (nanopb-0.3.4-29-gf8ac463)
d4d13a4349e4e59d67f311185ddcc1890d956d7a third_party/protobuf (v3.0.0-beta-3.2)
bdeb215cab2985195325fcd5e70c3fa751f46e0f third_party/protobuf (v3.0.0-beta-3.3)
50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
EOF

Loading…
Cancel
Save