dolphin/Source/Plugins/Plugin_VideoDX9
degasus 316a33d1e6 Merge branch 'master' into GLSL-master
Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
..
Src Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +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