Ryan Houdek 2a23bdde6f Merge branch 'master' into android-new-control-input-overlay ...

Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h

2013-11-13 16:17:42 -06:00

..

Android

Merge branch 'master' into android-new-control-input-overlay

2013-11-13 16:17:42 -06:00

Core

Merge branch 'master' into android-new-control-input-overlay

2013-11-13 16:17:42 -06:00

DSPSpy

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

DSPTool

Fix {Read,Write}FileToString.

2013-11-05 00:33:41 +13:00

TestSuite

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

UnitTests

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

VSProps

[windows] update SDL-2.0.0 to 2.0.1. Fixes issue 6793.

2013-11-04 23:50:52 -08:00

CMakeLists.txt

[Android] Fix PCH build. Clean up DolphinWX cmake file a little bit. Modify our android cmake toolchain file to make the default build location not be source root, because that is stupid.

2013-10-28 19:59:03 -05:00

dolphin-emu.sln

Update to VS2013 and a slew of build-related updates. Notes:

2013-10-26 17:55:38 -07:00

pch.h

Fix Linux build issue.

2013-10-27 19:51:55 -04:00