Über 4.0-17

Version
4.0-17
Entwicklungszweig
master
Zeitpunkt
11 Jahre, 1 Monat her
Windows x64 Windows x86 Mac OS X Android Ubuntu 13.04
Commit
f3469c16a51f2652496c1a6a6cd60537241fbca5
Author der Änderung
Rachel Bryk
Beschreibung der Änderung 
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