dolphin/Source/Plugins/Plugin_VideoDX11
degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
..
Src Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
Plugin_VideoDX11.vcxproj build against wxWidgets3 from Externals on Windows. 2012-03-18 02:31:19 -07:00
Plugin_VideoDX11.vcxproj.filters Revert r7421 and r7422. 2011-06-11 19:37:21 +00:00