5 Commits (2b443ad83d7d1ea57e6efbce945574dfde198a2f)

Author	SHA1	Message	Date
Paul Hollinsky	399c72e61d	Resolve merge conflicts master into devicesettings	2018-09-26 18:24:59 -04:00
Paul Hollinsky	2099ba9d1e	Resolve macOS warnings and standardize style	2018-09-24 19:04:20 -04:00
Paul Hollinsky	da4d9e46be	Start work on device settings communication	2018-09-24 16:57:14 -04:00
Paul Hollinsky	af4f4894f5	C++11 and CMake 3.2 compliance changes	2018-09-21 17:32:47 -04:00
Paul Hollinsky	e2e5017331	Initial commit	2018-09-10 20:28:29 -04:00