Waldemar Brodkorb f14c1fc551 resolve merge conflict il y a 10 ans
..
patches d6ce7a9b7c added log4cxx il y a 13 ans
Makefile f14c1fc551 resolve merge conflict il y a 10 ans