Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 年之前
..
patches bf74f495c3 fix musl compile, update to latest git version 11 年之前
Makefile f14c1fc551 resolve merge conflict 10 年之前