miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	project/jni/application/commandergenius/commandergenius
This commit is contained in:
Gerhard Stein
2012-12-21 08:50:11 +01:00
parent 3c507586d1 d44b62ed72
commit 67fbc6822d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/application/openarena/AndroidAppSettings.cfg
View File

@@ -36,9 +36,9 @@ StartupMenuButtonTimeout=3000
HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig' HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
FirstStartMenuOptions='' FirstStartMenuOptions=''
MultiABI=y MultiABI=y
AppMinimumRAM=350 AppMinimumRAM=300
AppVersionCode=08813 AppVersionCode=08815
AppVersionName="0.8.8.13" AppVersionName="0.8.8.15"
ResetSdlConfigForThisVersion=y ResetSdlConfigForThisVersion=y
DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag .openarena/baseoa/q3config.cfg" DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag .openarena/baseoa/q3config.cfg"
CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg" CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 18cec9de7c...8e5c2bbce3

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: 86f8d32314...a771033093