Waldemar Brodkorb f14c1fc551 resolve merge conflict il y a 11 ans
..
patches 5bdd932877 update to latest upstream il y a 11 ans
Makefile f14c1fc551 resolve merge conflict il y a 11 ans