Information for real-wiimote-scanning-3.5-402

Version
3.5-402
Branch
real-wiimote-scanning
Date
11 years, 10 months ago
Windows x64 Windows x86
Commit
c4df69a342bd37420b61ebe6df6a0c6af915c877
Change author
Jordan Woyak
Change description 
Merge branch 'master' into real-wiimote-scanning

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