Merge branch 'master' into unclean-versioning

2016-03-17 02:14:58 +01:00 · 2016-03-17 02:14:58 +01:00 · 12f6073260
commit 12f6073260
parent e3e222611d b36a1939ac
3 changed files with 2 additions and 1 deletions
--- a/deps/protobuf
+++ b/deps/protobuf
@ -1 +1 @@
-Subproject commit 44fdead9d2652f958cb6e7e29a6d871ef132bb4c
+Subproject commit ca3dc15d4ca3bb1b092928b456ea844637693b61
--- a/generate.bat
+++ b/generate.bat
@ -1,3 +1,4 @@
@echo off
 echo Updating submodules...
 git submodule update --init --recursive
 tools\premake5 %* vs2015
--- a/tools/premake5.exe
+++ b/tools/premake5.exe
		`@ -1 +1 @@`
			`Subproject commit 44fdead9d2652f958cb6e7e29a6d871ef132bb4c`				`Subproject commit ca3dc15d4ca3bb1b092928b456ea844637693b61`