Dolphin Emulator - Information on wii-network-3.5-200

Version: 3.5-200
Branch: wii-network
Date: 11 years, 4 months ago

Commit

e0c9a1fd09b9be953bf0ae41b9014485e750b07e

Change author

Matthew Parlane

Change description

Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp

Information for wii-network-3.5-200