Mindustry/android
Anuken 9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
2018-03-09 20:58:21 -05:00
..
res
src/io/anuke/mindustry Changed android UUID flow, again 2018-03-08 22:36:22 -05:00
AndroidManifest.xml
build.gradle
ic_launcher-web.png
proguard-project.txt
project.properties