Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 年之前
..
patches 15a3acd940 update to latest stable version 11 年之前
Makefile f14c1fc551 resolve merge conflict 11 年之前