degasus a1c5e90083 Merge branch 'master' into GLSL-master
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp
2013-03-06 15:59:29 +01:00
..
2012-03-25 13:01:26 +03:00
2013-02-26 19:59:33 -06:00
2013-02-21 13:45:48 +01:00
2013-02-07 23:52:50 -06:00
2013-02-26 13:49:00 -06:00
2013-02-26 13:49:00 -06:00
2013-03-03 07:37:22 +00:00
2011-09-29 23:32:39 +02:00
2013-03-01 01:31:57 +01:00
2011-01-31 03:02:23 +00:00
2013-01-24 13:10:13 +01:00
2012-01-04 01:36:09 -08:00
2013-02-26 13:49:00 -06:00
2013-01-24 13:10:13 +01:00