Ryan Houdek 8c1091a21f Merge branch 'master' into GLSL-master ... Conflicts: Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp		2013-03-15 11:19:52 -05:00
..
Src	Merge branch 'master' into GLSL-master	2013-03-15 11:19:52 -05:00
resources	Makes the "No banner" banner image theme-able. Current "sexy X" banner included as part of "Boomy" theme.	2013-02-22 15:30:07 -05:00
CMakeLists.txt	Merge branch 'master' into GLSL-master	2013-03-06 15:59:29 +01:00
Dolphin.vcxproj	clear cg from project files	2013-02-27 10:55:25 +01:00
Dolphin.vcxproj.filters	remove scons files from VS projects	2012-03-18 06:41:12 -07: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	Applied compile and link flags from SCons build for OS X to CMake build.	2011-12-11 21:27:06 +01:00
resource.h	set svn:eol-style=native for **.h	2008-12-08 04:46:09 +00:00