Dolphin Emulator - Information on 4.0-17

Our mission is to preserve video games. If you are an EU citizen you can help us in our mission by signing the Stop Killing Games EU initiative!

Sign Now

Version: 4.0-17
Branch: master
Date: 11 years, 1 month ago

Windows x64 Windows x86 Mac OS X Android Ubuntu 13.04

Commit

f3469c16a51f2652496c1a6a6cd60537241fbca5

Change author

Rachel Bryk

Change description

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

Information for 4.0-17