Versão
3.5-402
Branch
real-wiimote-scanning
Data
11anos, 10mesesatrás
Windows x64 Windows x86
Revisão
c4df69a342bd37420b61ebe6df6a0c6af915c877
Autor
Jordan Woyak
Descrição
Merge branch 'master' into real-wiimote-scanning

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