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	llejit - fix for flag generation code + dspspy jit workaround	2011-04-15 13:04:20 +00:00
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	drop vs2008 projects in favor of vs2010	2011-02-11 15:43:05 +00:00
UnitTests	Let "make install" on OS X copy the bundle to /Applications.	2011-12-14 02:50:36 +01:00
VSProps	Merge branch 'master' into wxw3-update	2012-03-22 17:57:38 -07: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