Protobuf is even more fucked on master!

2016-10-01 02:21:48 +02:00 · 2016-10-01 02:21:48 +02:00 · ff7098cf54
commit ff7098cf54
parent b49d153d4e
2 changed files with 3 additions and 2 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -17,7 +17,8 @@
 	path = deps/protobuf
 	url = https://github.com/google/protobuf.git
 	shallow = true
-	branch = master
+	branch = 3.1.x
+	ignore=dirty
 [submodule "deps/libtomcrypt"]
 	path = deps/libtomcrypt
 	url = https://github.com/libtom/libtomcrypt.git
--- a/deps/protobuf
+++ b/deps/protobuf
@ -1 +1 @@
-Subproject commit 350d49449bcabb491f1fb05e3ac2a91717c9ef04
+Subproject commit 9a2244704fa20ac29d2c9af612da961b80d3da1e