ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Android
History
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 Update the ant files to build the APK from terminal 2013-04-18 23:26:00 -05:00
libs [Android] Remove SimonVT menudrawer library. Move to Google's support library for their navigation drawer support. Overall cleanup. 2013-06-22 07:45:05 -05:00
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 Android mega commit of trash. 2013-03-19 21:53:09 -05:00
.project Change Android project name to dolphin emulator 2013-04-24 09:00:14 -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
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
build.xml Android mega commit of trash. 2013-03-19 21:53:09 -05:00
custom_rules.xml [Android] Hopefully fix buildbot's ant build. 2013-08-20 15:41:11 -05:00
project.properties [Android] Fix ant build? 2013-06-22 08:06:39 -05:00