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 08:21:08 -05:00
2011-03-16 22:48:17 +00:00
2011-02-03 19:55:30 +00:00
2010-07-06 16:16:07 +00:00
2011-03-16 22:48:17 +00:00
2011-03-16 22:48:17 +00:00
2013-01-14 16:29:52 -05:00
2013-01-14 16:29:52 -05:00
2012-12-17 14:54:20 -06:00
2010-07-06 16:16:07 +00:00
2012-12-30 04:32:37 -06:00
2010-12-31 06:45:18 +00:00
2012-12-29 21:50:07 -06:00
2012-12-17 14:54:20 -06:00
2010-12-31 06:45:18 +00:00
2011-03-16 22:48:17 +00:00
2011-01-31 01:28:32 +00:00
2013-01-08 18:16:48 +01:00
2010-06-09 01:37:08 +00:00
2011-02-03 19:55:30 +00:00
2010-07-06 16:16:07 +00:00
2010-06-09 01:37:08 +00:00
2010-06-09 01:37:08 +00:00
2011-03-16 22:48:17 +00:00
2011-03-16 22:48:17 +00:00
2013-01-19 02:18:39 -06:00
2011-02-14 02:18:03 +00:00
2011-02-14 02:18:03 +00:00
2013-01-24 16:58:28 +01:00
2011-02-03 19:55:30 +00:00
2011-02-03 19:55:30 +00:00
2011-02-03 19:55:30 +00:00
2012-12-10 00:40:28 -06:00
2011-02-03 19:55:30 +00:00
2013-01-19 00:51:14 -06:00
2011-02-14 02:18:03 +00:00
2013-01-08 18:56:01 +01:00
2010-12-31 06:45:18 +00:00
2011-03-16 22:48:17 +00:00
2010-07-06 16:16:07 +00:00
2013-01-10 18:30:16 +01:00
2010-12-31 06:45:18 +00:00
2011-02-06 01:56:45 +00:00
2010-07-06 16:16:07 +00:00
2010-08-01 16:14:35 +00:00
2012-12-23 13:32:23 +01:00
2013-01-13 03:33:11 -06:00
2011-06-02 19:32:34 +00:00
2011-03-16 22:48:17 +00:00
2011-02-03 19:55:30 +00:00