Information for udpnet-4.0-466

Version
4.0-466
Branch
udpnet
Date
9 years, 4 months ago
Windows x64 Windows x86 Mac OS X Android
Commit
af381517bd620cd6f6c80869be7ed9f19db0c8e0
Change author
comex
Change description 
Merge branch 'master' into udpnet

Conflicts:
	Source/Core/Common/Src/IniFile.cpp
	Source/Core/Common/Src/IniFile.h
	Source/Core/Common/Src/StdMutex.h
	Source/Core/Core/Src/ActionReplay.cpp
	Source/Core/Core/Src/HW/SI.cpp
	Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
	Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp
	Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
	Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
	Source/Core/Core/Src/HW/SI_DeviceGCController.h
	Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
	Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h
	Source/Core/Core/Src/NetPlayClient.cpp
	Source/Core/Core/Src/NetPlayServer.cpp
	Source/Core/Core/Src/PatchEngine.cpp
	Source/Core/Core/Src/State.cpp
	Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
	Source/Core/DolphinWX/Src/GameListCtrl.cpp
	Source/Core/DolphinWX/Src/NetWindow.cpp