Hermann Kraus 346ce07117 Merge commit '88360c365f2ea288740db51e65588f839fc67bba' into harfbuzz ... Conflicts: include/mapnik/cairo_renderer.hpp		2013-03-16 18:21:59 +01:00
..
mapnik	Merge commit '88360c365f2ea288740db51e65588f839fc67bba' into harfbuzz	2013-03-16 18:21:59 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00