Paul Hollinsky 399c72e61d Resolve merge conflicts master into devicesettings		2018-09-26 18:24:59 -04:00
..
devices.h	Added support for neoOBD2-SIM	2018-09-20 18:11:47 -04:00
dynamiclib.h	Refactor icsneoc to icsneo_functionName to avoid conflicts with legacy	2018-09-26 16:38:28 -04:00
ftdi.h	Resolve macOS warnings and standardize style	2018-09-24 19:04:20 -04:00
stm32.h	Resolve macOS warnings and standardize style	2018-09-24 19:04:20 -04:00