Version
4.0-375
Branch
android-new-control-input-overlay
Date
9 years, 5 months ago
Windows x64 Windows x86 Android
Commit
2a23bdde6f76c0bff0906bbbee298480b52ba0c2
Change author
Ryan Houdek
Change description
Merge branch 'master' into android-new-control-input-overlay

Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h