74c05e8229
Conflicts: project/jni/application/vcmi/AndroidAppSettings.cfg project/jni/application/vcmi/Makefile
Conflicts: project/jni/application/vcmi/AndroidAppSettings.cfg project/jni/application/vcmi/Makefile