Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
files 2d7666cde2 simplify add_rcconf 10 lat temu
patches 27954674d8 fix cross-compile on Cygwin 14 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu