dolphin-emulator/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 Remove scons-related files 2012-03-25 12:55:02 -07:00
Plugins Merge branch 'Graphic_Update' into GLSL-master 2013-01-14 21:36:31 +01:00
TestSuite
UnitTests Remove scons-related files 2012-03-25 12:55:02 -07:00
VSProps remove cg from windows project files 2012-12-28 01:08:29 +01:00
CMakeLists.txt
Dolphin_2010.sln Make sure updating scmrev.h causes a rebuild of dependant projects. 2012-03-19 03:40:14 -07:00