Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 éve
..
patches 854670adfd fix build 12 éve
Makefile f14c1fc551 resolve merge conflict 12 éve