Version
3.5-402
Gren
real-wiimote-scanning
Dato
11 år, 9 måneder siden
Windows x64 Windows x86
Commit
c4df69a342bd37420b61ebe6df6a0c6af915c877
Skift forfatter
Jordan Woyak
Skift beskrivelse
Merge branch 'master' into real-wiimote-scanning

Conflicts:
	Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
	Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp