Hermann Kraus 87395157c6 Merge commit 'bda0375f9728f3b8b2cc74d9338f9a84f527ba2f' into harfbuzz ... Conflicts: include/mapnik/font_engine_freetype.hpp		2013-03-16 17:47:17 +01:00
..
mapnik	Merge commit 'bda0375f9728f3b8b2cc74d9338f9a84f527ba2f' into harfbuzz	2013-03-16 17:47:17 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00