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 bff02b3b73 Merge branch 'arb_framebuffer' into GLSL-master 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
 		2013-01-09 11:00:26 +01:00
..
Src Merge branch 'arb_framebuffer' into GLSL-master 2013-01-09 11:00:26 +01:00
CMakeLists.txt Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
Plugin_VideoOGL.vcxproj remove cg from windows project files 2012-12-28 01:08:29 +01:00
Plugin_VideoOGL.vcxproj.filters add ProgramShaderCache.* to visual studio project files 2012-10-09 23:41:05 -05:00