dolphin/Source
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
..
Core Merge branch 'Graphic_Update' into GLSL-master 2013-01-14 21:36:31 +01:00
DSPSpy
DSPTool
Plugins Merge branch 'Graphic_Update' into GLSL-master 2013-01-14 21:36:31 +01:00
TestSuite
UnitTests
VSProps
CMakeLists.txt
Dolphin_2010.sln