emu-mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-02 20:01:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
316a33d1e6
dolphin/Source
History
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
..
Core Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
DSPSpy llejit - fix for flag generation code + dspspy jit workaround 2011-04-15 13:04:20 +00:00
DSPTool Remove scons-related files 2012-03-25 12:55:02 -07:00
Plugins Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
TestSuite drop vs2008 projects in favor of vs2010 2011-02-11 15:43:05 +00:00
UnitTests Remove scons-related files 2012-03-25 12:55:02 -07:00
VSProps Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
CMakeLists.txt Add the DSPTool and UnitTests to the cmake build. They are optional, and to enable them add -DDSTPTOOL and -DUNITTESTS to the cmake command line. 2011-07-18 01:47:55 +00:00
Dolphin_2010.sln Make sure updating scmrev.h causes a rebuild of dependant projects. 2012-03-19 03:40:14 -07:00