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
..
2012-12-24 08:01:44 +13:00
2012-12-26 12:12:26 -06:00
2012-12-24 19:50:16 +01:00
2012-12-03 20:58:25 -05:00
2012-11-16 23:54:48 +01:00
2012-11-16 23:54:48 +01:00
2012-12-10 00:40:28 -06:00
2012-10-22 12:32:57 +02:00
2012-12-24 08:01:44 +13:00
2012-12-24 08:01:44 +13:00
2012-12-25 21:12:51 -06:00
2012-12-25 06:31:31 -05:00
2012-12-17 06:08:45 -05:00
2012-12-26 12:12:26 -06:00
2012-11-11 17:57:06 -05:00
2012-12-10 00:40:28 -06:00
2012-12-10 00:40:28 -06:00
2012-12-25 13:51:13 +01:00
2012-10-29 21:02:59 -07:00
2012-12-24 08:01:44 +13:00
2012-12-24 08:01:44 +13:00
2012-12-24 12:22:02 -06:00
2012-12-23 19:53:15 +13:00
2012-12-23 19:53:15 +13:00
2012-12-10 00:40:28 -06:00