Version
3.5-268
Branch
wii-network
Date
11 years, 3 months ago
Windows x64 Windows x86 Mac OS X
Commit
9754fda516f35330c189d0bd242a9c847e279061
Change author
Matthew Parlane
Change description
Merge branch 'wii-usb' into temp merge branch

Conflicts:
	Source/Core/Common/Src/Log.h
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props