Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 年之前
..
patches d6ce7a9b7c added log4cxx 14 年之前
Makefile f14c1fc551 resolve merge conflict 11 年之前