Ryan Houdek ba18f38e70 Merge branch 'master' into android-new-control-input-overlay ... Conflicts: Source/Android/res/values-ja/strings.xml Source/Android/res/values/strings.xml Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java		2013-11-24 16:12:00 -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] Support multiple gamepads with touch screen controls.	2013-11-24 15:04:53 -06:00
jni
libs
res	Merge branch 'master' into android-new-control-input-overlay	2013-11-24 16:12:00 -06:00
src/org/dolphinemu/dolphinemu	Merge branch 'master' into android-new-control-input-overlay	2013-11-24 16:12:00 -06:00
.classpath	[Android] Ensure that required dependencies are actually exported along with everything else when the Android version builds. Without this, the support libs will not export and cause the emulator to crash upon being executed.	2013-08-17 12:26:43 -04:00
.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] Bump the targetSdkVersion in the AndroidManifest XML file to 19 (KitKat). Nothing we do would require compatibility behaviors to be enabled to maintain forward compatibility.	2013-11-14 11:01:44 -05:00
build.xml
custom_rules.xml	[Android] Hopefully fix buildbot's ant build.	2013-08-20 15:41:11 -05:00
project.properties