dolphin/Source
Pierre Bourdon fdff4cb1ff Merge branch 'master' into wii-network
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
2012-05-16 09:27:37 +02:00
..
Core Merge branch 'master' into wii-network 2012-05-16 09:27:37 +02:00
DSPSpy llejit - fix for flag generation code + dspspy jit workaround 2011-04-15 13:04:20 +00:00
DSPTool Remove scons-related files 2012-03-25 12:55:02 -07:00
Plugins Fixed texture encoding in DX11. Thanks to wordmanwords for the patch. 2012-05-06 10:51:38 +10:00
TestSuite
UnitTests Remove scons-related files 2012-03-25 12:55:02 -07:00
VSProps Merge branch 'master' into wii-network 2012-05-16 09:27:37 +02:00
CMakeLists.txt Add the DSPTool and UnitTests to the cmake build. They are optional, and to enable them add -DDSTPTOOL and -DUNITTESTS to the cmake command line. 2011-07-18 01:47:55 +00:00
Dolphin_2010.sln Make sure updating scmrev.h causes a rebuild of dependant projects. 2012-03-19 03:40:14 -07:00