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