Matthew Parlane 9754fda516 Merge branch 'wii-usb' into temp merge branch ...

Conflicts:
	Source/Core/Common/Src/Log.h
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

2013-01-11 23:07:12 +13:00

..

Core

Merge branch 'wii-usb' into temp merge branch

2013-01-11 23:07:12 +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

Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae

2013-01-07 13:47:34 -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 'wii-usb' into temp merge branch

2013-01-11 23:07:12 +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