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
..
arrays.xml	Add the JITIL Arm recompiler to the Android settings.	2013-10-09 23:08:12 +00:00
strings.xml	Merge branch 'master' into android-new-control-input-overlay	2013-11-29 21:27:17 -06:00