Version
3.5-540
Branch
wii-network
Date
11 years, 2 months ago
Windows x64 Windows x86 Mac OS X
Commit
3d480c088fa27c6dcadef40042a0e8deb3093985
Change author
Matthew Parlane
Change description
Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp