Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 éve
..
patches d8eb95ffc8 fix build 12 éve
Makefile f14c1fc551 resolve merge conflict 11 éve