Hermann Kraus 495bad25b6 Merge commit '3149c8db3d4fa0e536d18b8c189d7d6d96e1f1f7' into harfbuzz ... Conflicts: include/mapnik/text/formatting/base.hpp src/text/formatting/expression.cpp		2013-03-16 16:15:42 +01:00
..
mapnik	Merge commit '3149c8db3d4fa0e536d18b8c189d7d6d96e1f1f7' into harfbuzz	2013-03-16 16:15:42 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00