Waldemar Brodkorb f14c1fc551 resolve merge conflict il y a 10 ans
..
patches b7c4dda05e fix building on Darwin il y a 10 ans
Makefile f14c1fc551 resolve merge conflict il y a 10 ans