Shawn Hoffman f7423a0a4f Merge branch 'master' into wxw3-update ...

Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp

2012-03-22 17:57:38 -07:00

..

Core

Merge branch 'master' into wxw3-update

2012-03-22 17:57:38 -07:00

DSPSpy

…

DSPTool

remove scons files from VS projects

2012-03-18 06:41:12 -07:00

Plugins

Merge branch 'master' into wxw3-update

2012-03-22 17:57:38 -07:00

TestSuite

…

UnitTests

…

VSProps

Merge branch 'master' into wxw3-update

2012-03-22 17:57:38 -07: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