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 e0ffdda26e Merge branch 'immediate-removal' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
 		2013-01-24 16:58:28 +01:00
..
Plugin_VideoDX9 Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
Plugin_VideoDX11 Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
Plugin_VideoOGL Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
Plugin_VideoSoftware Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
CMakeLists.txt Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00