ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Core/DolphinWX
History
Matthew Parlane 9de7611ff9 Merge branch 'master' into wii-network 
Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
 		2013-08-16 19:17:07 +12:00
..
Src Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
resources Fix ICC profiles in some of our PNGs (ic_drawer, Dolphin icon). 2013-07-07 02:40:59 +02:00
CMakeLists.txt Actually link to XI2 2013-07-21 01:59:40 -04:00
Dolphin.vcxproj Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
Dolphin.vcxproj.filters Replace OpenSSL with PolarSSL 2013-08-15 20:47:47 +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 Add retina display support for Mac. 2013-03-31 11:36:42 -07:00
resource.h set svn:eol-style=native for **.h 2008-12-08 04:46:09 +00:00