Versie
4.0-145
Branche
dc-netplay
Datum
6 jaar, 9 maanden geleden
Windows x64 Windows x86 Mac OS X
Commit
228a508d768e7f6b1c6c3445e92a8a1451156d0d
Auteur
Rachel Bryk
Beschrijving
Merge branch 'master' into dc-netplay

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