Information för wii-network-3.5-2049

Version
3.5-2049
Gren
wii-network
Datum
10 år, 8 månader sedan
Windows x64 Windows x86
Revisionsinformation
b6e054a2beef3236822e27d95dfe38a4ccee2eb1
Ändringens upphovsman
Matthew Parlane
Ändringens beskrivning 
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