Waldemar Brodkorb f14c1fc551 resolve merge conflict il y a 11 ans
..
patches 57d3349d5a update to latest upstream version il y a 11 ans
Makefile f14c1fc551 resolve merge conflict il y a 11 ans