Extra merge changes

This commit is contained in:
Anuken
2018-03-16 22:19:35 -04:00
parent 4a7c722673
commit ed0b796c5a
4 changed files with 441 additions and 610 deletions

View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify.
#Fri Mar 16 21:46:55 EDT 2018
#Fri Mar 16 22:18:26 EDT 2018
version=release
androidBuildCode=528
androidBuildCode=531
name=Mindustry
code=3.4
build=custom build