mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-19 10:35:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
ca4ea817e0
dolphin/Source/Core
History
Matthew Parlane ca4ea817e0 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.h
	Source/Core/Core/Src/HLE/HLE.cpp
	Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
2013-01-26 21:46:12 +13:00
..
AudioCommon Move DSP settings to dolphin.ini 2013-01-16 20:17:44 -05:00
Common Merge branch 'master' into wii-network 2013-01-26 21:46:12 +13:00
Core Merge branch 'master' into wii-network 2013-01-26 21:46:12 +13:00
DiscIO Merge branch 'ES_LAUNCH' 2013-01-16 20:22:29 +11:00
DolphinWX Add support for the mouse cursor and mouse clicking events on OS X. 2013-01-17 23:32:07 -08:00
InputCommon Add support for the mouse cursor and mouse clicking events on OS X. 2013-01-17 23:32:07 -08:00
VideoCommon Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)." 2013-01-16 15:46:11 -05:00
CMakeLists.txt