Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 26f7c999e7 another round of native compile fixes 13 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu