Ryan Houdek bab91494d5 Merge branch 'master' into android-core-control

2013-09-23 00:47:57 -05:00

..

.settings

[Android] Change the .settings file to target Java 1.6 instead of 1.5.

2013-08-22 07:39:11 -04:00

assets

Add the new 'Clean' themes from MaJoR and default to Clean by changing the name of the config key (yes, hack)

2013-09-22 16:00:56 +02:00

jni

…

libs

…

res

Merge branch 'master' into android-core-control

2013-09-23 00:47:57 -05:00

src/org/dolphinemu/dolphinemu

Merge branch 'master' into android-core-control

2013-09-23 00:47:57 -05:00

.classpath

…

.gitignore

…

.project

…

android.toolchain.cmake

…

AndroidManifest.xml

[Android] Use new 4.0 icon.

2013-09-23 00:25:34 -05:00

build.xml

…

custom_rules.xml

…

project.properties

…