Information för 4.0-17

Version
4.0-17
Gren
master
Datum
11 år, 3 månader sedan
Windows x64 Windows x86 Mac OS X Android Ubuntu 13.04
Revisionsinformation
f3469c16a51f2652496c1a6a6cd60537241fbca5
Ändringens upphovsman
Rachel Bryk
Ändringens beskrivning 
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