Gerhard Stein 75d5f09148 Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android ...

Conflicts:
	project/jni/application/commandergenius/AndroidAppSettings.cfg
	project/jni/application/commandergenius/AndroidData/keen1.zip
	project/jni/application/commandergenius/AndroidData/keen4.zip
	project/jni/application/commandergenius/AndroidData/keen7.zip
	project/jni/application/vcmi/AndroidAppSettings.cfg

2013-01-16 20:54:21 +01:00

..

java

More fixes to key remap dialog

2013-01-15 21:03:54 +02:00

jni

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

2013-01-16 20:54:21 +01:00

res

More fixes to key remap dialog

2013-01-15 21:03:54 +02:00

themes

Oh noez, I'v emessed up color channels in the keyboard theme! It shall be yellow, yellow I tell you!

2012-06-08 13:19:05 +03:00

AndroidManifestTemplate.xml

AdMob support added, you cannot yet hide or reposition the ad from the C code. Also did some cleanup on include files.

2012-09-05 21:26:35 +03:00

build.xml

Updated OpenTTD, fixes for NDK r6.

2011-10-26 16:03:12 +03:00

proguard.cfg

Added proguard.cfg from gjtorikian

2011-05-05 10:04:54 +03:00

project.properties

Cleaned up readme files and build files

2012-11-09 17:14:06 +02:00