Version
4.0-145
Branch
dc-netplay
Date
6 years ago
Windows x64 Windows x86 Mac OS X
Commit
228a508d768e7f6b1c6c3445e92a8a1451156d0d
Change author
Rachel Bryk
Change description
Merge branch 'master' into dc-netplay

Conflicts:
	Source/Core/Core/Src/BootManager.cpp
	Source/Core/Core/Src/CoreParameter.cpp