Waldemar Brodkorb f14c1fc551 resolve merge conflict пре 12 година
..
patches b7c4dda05e fix building on Darwin пре 12 година
Makefile f14c1fc551 resolve merge conflict пре 12 година