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
..
drawable	[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
drawable-hdpi
drawable-mdpi
drawable-xhdpi
drawable-xxhdpi
layout	[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
menu	Merge branch 'master' into android-new-control-input-overlay	2013-11-24 16:12:00 -06:00
values	Merge branch 'master' into android-new-control-input-overlay	2013-11-29 21:27:17 -06:00
values-ja	Merge branch 'master' into android-new-control-input-overlay	2013-11-29 21:27:17 -06:00
xml	[Android-overlay] Disable Wiimote configuration until it is wired up.	2013-11-29 21:12:36 -06:00