dolphin/Source/Plugins/Plugin_VideoDX11
degasus 2f78986e2c Merge branch 'Graphic_Update' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
2013-01-14 21:36:31 +01:00
..
Src Merge branch 'Graphic_Update' into GLSL-master 2013-01-14 21:36:31 +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