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

Fix the rest of the tooltips for linux.

2011-01-31 22:19:30 +00:00

Common.vcxproj

fix Common lib re-linking all the time

2012-03-18 05:47:55 -07:00

Common.vcxproj.filters

fix Common lib re-linking all the time

2012-03-18 05:47:55 -07:00

make_scmrev.h.js

Remove hash from revision description for cmake and windows.

2011-08-22 20:06:17 -05:00

SVNRevGen.vcxproj

fix Common lib re-linking all the time

2012-03-18 05:47:55 -07:00