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-03-26 21:50:49 +11:00
2013-02-27 10:55:25 +01:00
2012-03-25 12:55:02 -07:00
2013-02-27 10:55:25 +01:00