Información para 4.0-17

Versión
4.0-17
Póla
master
Data
10 anos, 7 meses ago
Windows x64 Windows x86 Mac OS X Android Ubuntu 13.04
Contribución
f3469c16a51f2652496c1a6a6cd60537241fbca5
Autor do cambio
Rachel Bryk
Descrición do cambio 
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