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-24 16:11:07 +01:00
2013-01-16 15:46:11 -05:00
2011-01-31 01:28:32 +00: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
2011-01-31 01:28:32 +00:00
2013-01-24 16:11:07 +01:00
2013-01-18 12:49:48 +01:00
2013-01-11 15:24:43 +01:00
2012-12-24 11:09:52 -06:00
2011-01-29 20:16:51 +00:00
2013-01-21 15:43:04 +01:00
2013-01-19 00:12:02 +01:00
2013-01-24 16:11:07 +01:00
2013-01-24 16:11:07 +01:00
2013-01-24 16:58:28 +01:00
2012-08-10 20:12:02 +02:00
2010-09-28 02:15:02 +00:00
2010-09-28 02:15:02 +00:00
2013-01-24 16:11:07 +01:00
2013-01-24 16:11:07 +01:00
2013-01-24 16:11:07 +01:00
2013-01-16 01:37:00 +01:00
2013-01-24 16:58:28 +01:00
2012-12-15 17:28:58 +01:00
2013-01-18 12:49:48 +01:00
2012-12-24 11:09:52 -06:00
2011-03-21 19:57:31 +00:00