Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 年之前
..
patches e2feaef43e rename getline to avoid conflict 16 年之前
Makefile f14c1fc551 resolve merge conflict 12 年之前