2 Commits

Author	SHA1	Message	Date
Scott Mansell	786e49ed48	Merge branch 'master' into videosoftware-xfb ... Conflicts: Source/Core/VideoBackends/Software/Src/EfbCopy.cpp Source/Core/VideoBackends/Software/Src/SWRenderer.cpp Source/Core/VideoBackends/Software/Src/SWRenderer.h Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp Source/Core/VideoBackends/Software/Src/SWmain.cpp	2013-11-23 23:20:45 +13:00
Jasper St. Pierre	a7c7208103	Put Plugins/ in Core/, rename to VideoBackends	2013-10-07 10:37:01 -04:00