Waldemar Brodkorb f14c1fc551 resolve merge conflict пре 12 година
..
Makefile f14c1fc551 resolve merge conflict пре 12 година