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