Version
4.0-145
Gren
dc-netplay
Datum
11 år, 1 månad sedan
Windows x64 Windows x86 Mac OS X
Revisionsinformation
228a508d768e7f6b1c6c3445e92a8a1451156d0d
Ändringens upphovsman
Rachel Bryk
Ändringens beskrivning
Merge branch 'master' into dc-netplay

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