Pierre Bourdon 0ffc12bbfd Merge branch 'master' into zcomploc-support ...

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp

2012-03-22 15:21:52 +01:00

..

AudioCommon

name all audio threads (that I know how to) for debugging, as suggested in response to revision d00b719966.

2012-01-01 14:28:19 -08:00

Common

Merged 'FifoBusy' branch. Thanks

2012-03-20 19:37:25 +11:00

Core

Fixes issue 4932 AGAIN :D

2012-03-22 22:52:12 +13:00

DiscIO

Fixes issue 5278. Thanks to megazig for finding the bug :)

2012-03-22 21:15:05 +13:00

DolphinWX

Merged 'FifoBusy' branch. Thanks

2012-03-20 19:37:25 +11:00

InputCommon

Merge branch 'fix-real-gcpad-sticks'

2011-12-12 23:25:32 -06:00

VideoCommon

Merge branch 'master' into zcomploc-support

2012-03-22 15:21:52 +01:00

CMakeLists.txt

Merge UI related projects into the main DolphinWX project.

2011-02-11 21:37:52 +00:00