ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Plugins/Plugin_VideoDX11
History
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_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