dolphin/Source/Plugins/Plugin_VideoDX9
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
Plugin_VideoDX9.vcxproj build against wxWidgets3 from Externals on Windows. 2012-03-18 02:31:19 -07:00
Plugin_VideoDX9.vcxproj.filters svn eol-style:native on the filters... 2011-01-31 07:58:59 +00:00