Hermann Kraus d7ebac77a3 Merge commit 'c3fab9e66502c135e4566005b63a63e04842ddf0' into harfbuzz ... Conflicts: include/mapnik/char_info.hpp		2013-03-16 17:55:20 +01:00
..
mapnik	Merge commit 'c3fab9e66502c135e4566005b63a63e04842ddf0' into harfbuzz	2013-03-16 17:55:20 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00