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
..
2013-01-11 21:24:59 +01:00
2013-01-22 00:18:42 +01:00
2013-01-14 23:43:51 +01:00
2010-09-28 02:15:02 +00:00
2010-09-28 02:15:02 +00:00
2013-01-16 01:37:00 +01:00
2011-03-21 19:57:31 +00:00