Waldemar Brodkorb 32a82e3867 resolve conflicts 12 years ago
..
files 0b3d040567 revert pango update 12 years ago
Makefile 32a82e3867 resolve conflicts 12 years ago