Merge branch 'master' into unclean-versioning
This commit is contained in:
commit
12f6073260
2
deps/protobuf
vendored
2
deps/protobuf
vendored
@ -1 +1 @@
|
||||
Subproject commit 44fdead9d2652f958cb6e7e29a6d871ef132bb4c
|
||||
Subproject commit ca3dc15d4ca3bb1b092928b456ea844637693b61
|
@ -1,3 +1,4 @@
|
||||
@echo off
|
||||
echo Updating submodules...
|
||||
git submodule update --init --recursive
|
||||
tools\premake5 %* vs2015
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user