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
..
2012-03-25 13:01:26 +03:00
2012-06-11 23:30:20 +02:00
2012-11-26 02:11:52 -05:00
2011-09-29 23:32:39 +02:00
2011-01-31 03:02:23 +00:00
2013-01-24 13:10:13 +01:00
2012-01-04 01:36:09 -08:00
2013-01-24 13:10:13 +01:00