Versi
4.0-17
Cabang
master
Tarikh
6 years, 10 months ago
Windows x64 Windows x86 Android Ubuntu 13.04 Mac OS X
Lakukan
f3469c16a51f2652496c1a6a6cd60537241fbca5
Ubah pengarang
Rachel Bryk
Ubah keterangan
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