dolphin-emulator/Source
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
..
Core Merge branch 'master' into GLSL-master 2013-02-18 18:49:20 +01:00
DSPSpy
DSPTool Remove scons-related files 2012-03-25 12:55:02 -07:00
Plugins Merge branch 'master' into GLSL-master 2013-02-18 18:49:20 +01:00
TestSuite
UnitTests Remove scons-related files 2012-03-25 12:55:02 -07:00
VSProps remove cg from windows project files 2012-12-28 01:08:29 +01:00
CMakeLists.txt
Dolphin_2010.sln Added audio time stretching by using the SoundTouch library. 2013-01-09 22:57:32 +11:00