dolphin/Source/Core
Rachel Bryk f3469c16a5 Merge branch 'wiimote-netplay'
Conflicts:
	Source/Core/Core/Src/NetPlayClient.cpp
	Source/Core/Core/Src/NetPlayClient.h
	Source/Core/Core/Src/NetPlayProto.h
	Source/Core/Core/Src/NetPlayServer.cpp
	Source/Core/Core/Src/NetPlayServer.h
	Source/Core/DolphinWX/Src/NetWindow.cpp
	Source/Core/DolphinWX/Src/NetWindow.h
2013-09-22 14:27:52 -04:00
..
AudioCommon A bunch of trivial changes to fix clang warnings. 2013-09-01 22:58:33 -04:00
Common Fix stack misalignment issues. 2013-09-20 16:46:48 -04:00
Core Merge branch 'wiimote-netplay' 2013-09-22 14:27:52 -04:00
DiscIO proper fix for issue 6206 2013-09-14 15:09:58 -07:00
DolphinWX Merge branch 'wiimote-netplay' 2013-09-22 14:27:52 -04:00
InputCommon [InputCommon] Fix a bug in ControllerInterface::UpdateOutput() in ControllerInterface.cpp. The variable ok_count was never incremented, which caused the function to always return false. 2013-09-18 10:09:32 -04:00
VideoCommon Fix stack misalignment issues. 2013-09-20 16:46:48 -04:00
CMakeLists.txt Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00