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

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-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

[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

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

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