Version
3.5-1363
Branch
wii-network
Date
11 years ago
Windows x64 Windows x86 Mac OS X
Commit
0c9d8d34e1307433e27435c7d2f84557fd563752
Change author
Matthew Parlane
Change description
Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/CMakeLists.txt