dolphin/Source/Core/DolphinWX
Matthew Parlane b6e054a2be Merge branch 'master' into wii-network
Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
2013-08-23 00:51:12 +12:00
..
resources Fix ICC profiles in some of our PNGs (ic_drawer, Dolphin icon). 2013-07-07 02:40:59 +02:00
Src Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00
CMakeLists.txt [Android] Fix Wii games. 2013-08-17 19:41:28 -05:00
Dolphin.vcxproj Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00
Dolphin.vcxproj.filters Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00
Dolphin.vcxproj.user vs2010: make -d be passed to debugfast builds launched from vs 2011-02-25 04:00:16 +00: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
Info.plist.in Change the OSX CFBundleIndentifier to use the proper domain name 2013-08-03 18:37:57 +02:00
resource.h