Scott Mansell 786e49ed48 Merge branch 'master' into videosoftware-xfb ...

Conflicts:
	Source/Core/VideoBackends/Software/Src/EfbCopy.cpp
	Source/Core/VideoBackends/Software/Src/SWRenderer.cpp
	Source/Core/VideoBackends/Software/Src/SWRenderer.h
	Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp
	Source/Core/VideoBackends/Software/Src/SWmain.cpp

2013-11-23 23:20:45 +13:00

..

Android

[Android] Remove accidental fragment tag in GameListActivity (it was useless, since it's an empty string)

2013-11-16 15:17:37 -05:00

Core

Merge branch 'master' into videosoftware-xfb

2013-11-23 23:20:45 +13:00

DSPSpy

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

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

DSPTool

Changed the DSP ROM warning from a panic alert to an on-screen message.

2013-11-22 14:55:25 +11: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

Use libpng for saving images.

2013-11-14 21:02:49 +13: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