Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 年之前
..
patches c8e25cfa42 update to latest upstream 13 年之前
Makefile f14c1fc551 resolve merge conflict 12 年之前