Travis Nickles 1215d32ae5 Merge branch 'jay' into vigem-udpserver
# Conflicts:
#	DS4Windows/DS4Control/ScpUtil.cs
2018-10-03 16:38:20 -05:00
..
2017-11-06 16:38:26 -06:00
2015-07-30 23:34:22 -04:00
2018-07-30 23:43:10 -05:00
2015-07-30 23:34:22 -04:00