From ff7098cf546be283eab1def03394d869bcaded41 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sat, 1 Oct 2016 02:21:48 +0200 Subject: [PATCH] Protobuf is even more fucked on master! --- .gitmodules | 3 ++- deps/protobuf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index ef76611b..a3c3d1e8 100644 --- 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 diff --git a/deps/protobuf b/deps/protobuf index 350d4944..9a224470 160000 --- a/deps/protobuf +++ b/deps/protobuf @@ -1 +1 @@ -Subproject commit 350d49449bcabb491f1fb05e3ac2a91717c9ef04 +Subproject commit 9a2244704fa20ac29d2c9af612da961b80d3da1e