Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches e020a31086 fix pc file 12 lat temu
src 33b69d0e9a more tar.gz fixes 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu