Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches ff1d7a15bb fix build on Cygwin 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu