Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 年之前
..
patches 2bf604ffc3 update some packages after libpng15 update, misc stuff 14 年之前
Makefile f14c1fc551 resolve merge conflict 11 年之前