paulsapps 9d16f6077e Fix merge glitch 11 lat temu
..
include 9d16f6077e Fix merge glitch 11 lat temu
src ce1bbee37b merge 11 lat temu
CMakeLists.txt 0cca7cb1ee fixes some warnings and crazy gcc link issue 11 lat temu