Versi
4.0-145
Cabang
dc-netplay
Tarikh
6 years, 9 months ago
Windows x64 Windows x86 Mac OS X
Lakukan
228a508d768e7f6b1c6c3445e92a8a1451156d0d
Ubah pengarang
Rachel Bryk
Ubah keterangan
Merge branch 'master' into dc-netplay

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