Matthew Parlane b6e054a2be Merge branch 'master' into wii-network ...

Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters

2013-08-23 00:51:12 +12:00

..

Android

[Android] General cleanup. Add more documentation.

2013-08-22 08:18:56 -04:00

Core

Merge branch 'master' into wii-network

2013-08-23 00:51:12 +12:00

DSPSpy

…

DSPTool

Buildfix for dsptool.

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

Plugins

Typo + Add Lima to the driverdetails.

2013-08-21 05:41:32 -05: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

…

Dolphin_2010.sln

Merge branch 'master' into wii-network

2013-08-16 19:17:07 +12:00