Version
4.0-473
Branch
android-new-control-input-overlay
Date
9 years, 4 months ago
Windows x64 Windows x86 Mac OS X
Commit
7bdd8191dbbde1324d2848fc256be820bc437fa2
Change author
Ryan Houdek
Change description
Merge branch 'master' into android-new-control-input-overlay

Conflicts:
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java