degasus 702198f39b Merge branch 'master' into primitive_restart
Conflicts:
	Source/Core/VideoCommon/Src/VideoConfig.h
	Source/Plugins/Plugin_VideoDX9/Src/main.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2013-04-08 15:57:51 +02:00
..
2013-02-26 19:59:33 -06:00
2013-03-28 23:00:19 +01:00
2013-02-21 13:45:48 +01:00
2011-09-29 23:32:39 +02:00
2013-03-01 01:31:57 +01:00
2011-01-31 03:02:23 +00:00
2013-04-08 14:50:58 +02:00
2013-04-08 03:11:45 -04:00
2012-01-04 01:36:09 -08:00