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_VideoOGL
History
degasus 702198f39b Merge branch 'master' into primitive_restart 
Conflicts:
	Source/Core/VideoCommon/Src/VideoConfig.h
	Source/Plugins/Plugin_VideoDX9/Src/main.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
 		2013-04-08 15:57:51 +02:00
..
Src Merge branch 'master' into primitive_restart 2013-04-08 15:57:51 +02:00
CMakeLists.txt Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
Plugin_VideoOGL.vcxproj Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
Plugin_VideoOGL.vcxproj.filters Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00