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
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
..
Plugin_VideoDX9 Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
Plugin_VideoDX11 Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
Plugin_VideoOGL Merge branch 'arb_framebuffer' into GLSL-master 2013-01-09 11:00:26 +01:00
Plugin_VideoSoftware Merge branch 'arb_framebuffer' into GLSL-master 2013-01-09 11:00:26 +01:00
CMakeLists.txt Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00