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

Version: 3.5-2049
Branch: wii-network
Date: 10 years, 8 months ago

Commit

b6e054a2beef3236822e27d95dfe38a4ccee2eb1

Change author

Matthew Parlane

Change description

Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters

Information for wii-network-3.5-2049