Waldemar Brodkorb f14c1fc551 resolve merge conflict il y a 12 ans
..
patches ebf68a45b5 update to latest upstream version il y a 12 ans
Makefile f14c1fc551 resolve merge conflict il y a 12 ans