Paul Hollinsky 399c72e61d Resolve merge conflicts master into devicesettings		2018-09-26 18:24:59 -04:00
..
callback/include	Resolve merge conflicts master into devicesettings	2018-09-26 18:24:59 -04:00
filter/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
neomessage.cpp	Resolve some compile errors and warnings that can arise under Linux	2018-09-20 14:26:59 -04:00