Ryan Houdek 7bdd8191db Merge branch 'master' into android-new-control-input-overlay ... Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java		2013-11-29 21:27:17 -06: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	[Android-overlay] Add the new overlay icons. Support configuring them. Disable hardfloat since it has issues since Dalvik doesn't understand passing floats due to ABI differences.	2013-11-29 18:37:33 -06:00
jni
libs
res	Merge branch 'master' into android-new-control-input-overlay	2013-11-29 21:27:17 -06:00
src/org/dolphinemu/dolphinemu	Merge branch 'master' into android-new-control-input-overlay	2013-11-29 21:27:17 -06:00
.classpath
.gitignore
.project
android.toolchain.cmake	[Android] Fix PCH build. Clean up DolphinWX cmake file a little bit. Modify our android cmake toolchain file to make the default build location not be source root, because that is stupid.	2013-10-28 19:59:03 -05:00
AndroidManifest.xml	[Android] Build the configuration window for the overlay programmatically. Moved the overlay configuration classes into their own package. Also launch the overlay config activity through the preference XML via an embedded Intent. Lets us remove code explicitly handling this.	2013-11-25 14:23:28 -05:00
build.xml
custom_rules.xml
project.properties