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

..

strings.xml

Merge branch 'master' into android-new-control-input-overlay

2013-11-29 21:27:17 -06:00