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-16 15:46:11 -05:00
2013-01-16 15:46:11 -05:00
2011-07-29 22:18:11 +00:00
2011-01-29 20:16:51 +00:00
2011-01-29 20:16:51 +00:00
2011-01-29 20:16:51 +00:00
2013-01-16 15:46:11 -05:00
2013-01-16 15:46:11 -05:00
2013-01-16 15:46:11 -05:00
2013-01-16 15:46:11 -05:00
2011-01-31 01:28:32 +00:00
2013-01-14 20:08:53 +01:00
2011-01-31 01:28:32 +00:00
2011-01-31 01:28:32 +00:00
2012-08-10 20:12:02 +02:00
2012-08-10 20:12:02 +02: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-19 00:47:48 +01:00
2013-01-19 00:47:48 +01:00
2012-01-31 19:51:32 +01:00
2012-01-31 19:51:32 +01:00
2012-11-12 19:37:08 -03:00
2012-10-26 23:18:09 -03:00
2011-09-29 23:16:42 +02:00
2011-09-29 22:54:52 +02:00
2011-03-21 19:57:31 +00:00