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
..
2013-11-13 04:01:16 +01:00
2013-11-13 04:01:16 +01:00
2013-11-13 04:01:16 +01:00
2013-09-25 03:06:27 -04:00
2013-11-13 04:01:16 +01:00
2013-07-05 22:39:18 -04:00
2013-09-22 14:27:52 -04:00
2013-09-25 03:06:27 -04:00