ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source
History
Matthew Parlane e0c9a1fd09 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
 		2013-01-01 23:28:46 +13:00
..
Core Merge branch 'master' into wii-network 2013-01-01 23:28:46 +13: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 Fix 4 warnings on OSX 2012-12-30 04:32:37 -06: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 'master' into wii-network 2013-01-01 23:28:46 +13: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