Skip to content
Browse files

Merge branch 'sdl_android' of github.com:pelya/commandergenius into s…

…dl_android

Conflicts:
	project/jni/application/commandergenius/commandergenius
  • Loading branch information...
2 parents 3c50758 + d44b62e commit 67fbc6822d754f670dba9da7bfda6e43648167f8 @gerstrong gerstrong committed
View
6 project/jni/application/openarena/AndroidAppSettings.cfg
@@ -36,9 +36,9 @@ StartupMenuButtonTimeout=3000
HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
FirstStartMenuOptions=''
MultiABI=y
-AppMinimumRAM=350
-AppVersionCode=08813
-AppVersionName="0.8.8.13"
+AppMinimumRAM=300
+AppVersionCode=08815
+AppVersionName="0.8.8.15"
ResetSdlConfigForThisVersion=y
DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag .openarena/baseoa/q3config.cfg"
CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"
2 project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 18cec9de7cba9e47ec75ce009176f95fdfc37595
+Subproject commit 8e5c2bbce310547036f47661ce164fcec99de043
2 project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit 86f8d32314a322712afd0b23c6f33cda7d9ac726
+Subproject commit a7710330935b977d3f068ca893f7fc2f89d48c1e

0 comments on commit 67fbc68

Please sign in to comment.
Something went wrong with that request. Please try again.