dolphin/Source/Plugins/Plugin_VideoSoftware
degasus a629dea4dc Merge branch 'master' into GLSL-master
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...
2013-02-18 18:49:20 +01:00
..
Src Merge branch 'master' into GLSL-master 2013-02-18 18:49:20 +01:00
CMakeLists.txt Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00
Plugin_VideoSoftware.vcxproj remove scons files from VS projects 2012-03-18 06:41:12 -07:00
Plugin_VideoSoftware.vcxproj.filters remove scons files from VS projects 2012-03-18 06:41:12 -07:00