Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 éve
..
patches ff449c57c5 update and fix build 11 éve
Makefile f14c1fc551 resolve merge conflict 11 éve