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