Ryan Houdek ba18f38e70 Merge branch 'master' into android-new-control-input-overlay ... Conflicts: Source/Android/res/values-ja/strings.xml Source/Android/res/values/strings.xml Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java		2013-11-24 16:12:00 -06:00
..
resources	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
Src	Merge branch 'master' into android-new-control-input-overlay	2013-11-24 16:12:00 -06:00
CMakeLists.txt	[Android] Fix PCH build. Clean up DolphinWX cmake file a little bit. Modify our android cmake toolchain file to make the default build location not be source root, because that is stupid.	2013-10-28 19:59:03 -05:00
DolphinWX.rc	Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not.	2012-12-17 08:33:42 -06:00
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	Update to VS2013 and a slew of build-related updates. Notes:	2013-10-26 17:55:38 -07:00
DolphinWX.vcxproj.user	Update to VS2013 and a slew of build-related updates. Notes:	2013-10-26 17:55:38 -07:00
Info.plist.in	Pull in translations from Transifex.	2013-09-21 11:24:33 -05:00
resource.h	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00