Pierre Bourdon 0ffc12bbfd Merge branch 'master' into zcomploc-support ... Conflicts: Source/Core/VideoCommon/Src/PixelShaderGen.cpp		2012-03-22 15:21:52 +01:00
..
Core	Merge branch 'master' into zcomploc-support	2012-03-22 15:21:52 +01:00
DSPSpy
DSPTool	Let "make install" on OS X copy the bundle to /Applications.	2011-12-14 02:50:36 +01:00
Plugins	Merged 'FifoBusy' branch. Thanks	2012-03-20 19:37:25 +11:00
TestSuite
UnitTests	Let "make install" on OS X copy the bundle to /Applications.	2011-12-14 02:50:36 +01:00
VSProps	I am very picky about my VS files... :D	2012-03-21 14:53:50 -07:00
CMakeLists.txt
Dolphin_2010.sln