xawotihs f550784973 Merge branch 'master' into wp8 ...

Conflicts:
	JGE/src/Qtmain.cpp

2013-11-29 22:31:20 +01:00

..

assets/_keystore

-Added Android release keystore (both passwords are 'password')

2013-05-12 19:47:12 +00:00

jni

Merge branch 'master' into wp8

2013-11-29 22:31:20 +01:00

res

updated version number to 0.19.2, changed min target to API 10 vs API 9 as recommended by Android

2013-10-28 16:19:01 -07:00

src

removing commented lines I had intended to delete outright

2013-11-07 15:56:43 -05:00

.gitignore

- updated AndroidManifest.xml to match desired API values.

2013-11-25 11:54:19 -05:00

AndroidManifest.xml

- updated AndroidManifest.xml to match desired API values.

2013-11-25 11:54:19 -05:00

ant.properties

-Added Android release keystore (both passwords are 'password')

2013-05-12 19:47:12 +00:00

build.xml

updating version to 0.18.3

2012-04-15 14:13:08 +00:00

default.properties

reverting sdk.buildtools change

2013-11-25 13:41:07 -05:00

proguard-project.txt

adding other required files for latest sdk ant builds

2012-04-15 14:24:18 +00:00

project.properties

reverting sdk.buildtools change

2013-11-25 13:41:07 -05:00