dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-02-20 07:13:49 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
bff02b3b73
dolphin/Source
History
degasus bff02b3b73 Merge branch 'arb_framebuffer' into GLSL-master 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2013-01-09 11:00:26 +01:00
..
Core Merge branch 'arb_framebuffer' into GLSL-master 2013-01-09 11:00:26 +01:00
DSPSpy
DSPTool Remove scons-related files 2012-03-25 12:55:02 -07:00
Plugins Merge branch 'arb_framebuffer' into GLSL-master 2013-01-09 11:00:26 +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