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
..
resources
Src	Merge branch 'master' into android-new-control-input-overlay	2013-11-29 21:27:17 -06:00
CMakeLists.txt	[Android] Enable hard-float support. Requires Android NDK r9b.	2013-11-24 16:43:53 -06:00
DolphinWX.rc
DolphinWX.vcxproj	[windows] update SDL-2.0.0 to 2.0.1. Fixes issue 6793.	2013-11-04 23:50:52 -08:00
DolphinWX.vcxproj.filters
DolphinWX.vcxproj.user
Info.plist.in
resource.h