Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches e2feaef43e rename getline to avoid conflict 15 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu