Version
4.0-304
Branch
udpnet
Date
9 years, 5 months ago
Windows x64 Windows x86
Commit
d8b91844383c5efd90db04b96c257d5bac3e2e06
Change author
comex
Change description
Merge branch 'master' into udpnet

Conflicts:
	Source/Core/Common/CMakeLists.txt
	Source/Core/Core/Src/NetPlayServer.cpp