degasus 316a33d1e6 Merge branch 'master' into GLSL-master
Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
..
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2012-10-09 23:23:37 -05:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2012-12-23 20:25:11 +13:00
2010-06-13 19:50:06 +00:00
2010-06-13 19:50:06 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00
2011-09-29 22:54:52 +02:00
2011-03-21 19:57:31 +00:00
2011-06-11 19:37:21 +00:00
2011-06-11 19:37:21 +00:00