Hermann Kraus 63acf3c248 Merge commit '0121f53f56327fda1aebb9d2e6c12aee07ef3b49' into harfbuzz ... Conflicts: include/mapnik/font_engine_freetype.hpp		2013-03-16 15:15:38 +01:00
..
mapnik	Merge commit '0121f53f56327fda1aebb9d2e6c12aee07ef3b49' into harfbuzz	2013-03-16 15:15:38 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00