dolphin/Source/Plugins
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
..
Plugin_VideoDX9 Merge branch 'master' into primitive_restart 2013-04-08 15:57:51 +02:00
Plugin_VideoDX11 Merge branch 'master' into primitive_restart 2013-04-08 15:57:51 +02:00
Plugin_VideoOGL Merge branch 'master' into primitive_restart 2013-04-08 15:57:51 +02:00
Plugin_VideoSoftware Fix a few typos in the comments/logging in VideoDX9, VideoCommon, and VideoSoftware projects. 2013-04-07 17:11:29 -04:00
CMakeLists.txt Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00