Versie
3.5-402
Branche
real-wiimote-scanning
Datum
11 jaar, 10 maanden geleden
Windows x64 Windows x86
Commit
c4df69a342bd37420b61ebe6df6a0c6af915c877
Auteur
Jordan Woyak
Beschrijving
Merge branch 'master' into real-wiimote-scanning

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