Paul Hollinsky 399c72e61d Resolve merge conflicts master into devicesettings		2018-09-26 18:24:59 -04:00
..
darwin/include	Resolve merge conflicts master into devicesettings	2018-09-26 18:24:59 -04:00
include	Resolve merge conflicts master into devicesettings	2018-09-26 18:24:59 -04:00
linux/include	Refactor icsneoc to icsneo_functionName to avoid conflicts with legacy	2018-09-26 16:38:28 -04:00
ftdi.cpp	Move platforms around, most of POSIX will be common implementation	2018-09-20 14:40:24 -04:00
stm32.cpp	Resolve macOS warnings and standardize style	2018-09-24 19:04:20 -04:00