Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 42dd254f59 full build on Darwin fixes 13 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu