Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 1dbfbd6e0c c++ compiler fixes 15 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu