Waldemar Brodkorb f14c1fc551 resolve merge conflict пре 11 година
..
patches 2bf604ffc3 update some packages after libpng15 update, misc stuff пре 14 година
Makefile f14c1fc551 resolve merge conflict пре 11 година