degasus 2f78986e2c Merge branch 'Graphic_Update' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
2013-01-14 21:36:31 +01:00
..
2013-01-14 20:08:53 +01:00
2010-09-28 02:15:02 +00:00
2010-09-28 02:15:02 +00:00
2011-09-29 22:54:52 +02:00
2011-03-21 19:57:31 +00:00