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_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