From b49d153d4ee2f5ded99788b6f780a11dbc3b1ead Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sat, 1 Oct 2016 02:07:49 +0200 Subject: [PATCH] Fix protobuf --- .gitmodules | 2 +- deps/protobuf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 912cbab5..ef76611b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ path = deps/protobuf url = https://github.com/google/protobuf.git shallow = true - branch = 3.1.x + branch = master [submodule "deps/libtomcrypt"] path = deps/libtomcrypt url = https://github.com/libtom/libtomcrypt.git diff --git a/deps/protobuf b/deps/protobuf index b258c4b1..350d4944 160000 --- a/deps/protobuf +++ b/deps/protobuf @@ -1 +1 @@ -Subproject commit b258c4b16d2d2af77bfbc5e1b265f7fb2dda7b76 +Subproject commit 350d49449bcabb491f1fb05e3ac2a91717c9ef04