Matthew Parlane 15f8603d1f Merge branch 'master' into wii-network ...

Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.cpp

2013-08-26 00:50:57 +00:00

..

Android

Merge branch 'master' into wii-network

2013-08-26 00:50:57 +00:00

Core

Merge branch 'master' into wii-network

2013-08-26 00:50:57 +00:00

DSPSpy

…

DSPTool

Buildfix for dsptool.

2013-05-21 20:30:09 -04:00

Plugins

Merge remote-tracking branch 'remotes/origin/dx9-ssaa-fix'

2013-08-23 22:43:03 -03:00

TestSuite

clear cg from project files

2013-02-27 10:55:25 +01:00

UnitTests

Adding unit test project to VS solution

2013-05-22 03:29:58 +02:00

VSProps

Merge branch 'master' into wii-network

2013-08-16 19:17:07 +12: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

Fix debug builds. Sorry.

2013-08-25 13:39:30 +12:00