Hermann Kraus 290c2b4a26 Large manual merge. A lot of the changes could not be applied directly ... as a different solution was used in the new branch. Merge commit '6cbceafc45eda71ae379a3dfd7c52712ebe8422b' into harfbuzz Conflicts: include/mapnik/font_engine_freetype.hpp src/font_engine_freetype.cpp src/grid/process_text_symbolizer.cpp		2013-03-23 03:00:39 +01:00
..
mapnik	Large manual merge. A lot of the changes could not be applied directly	2013-03-23 03:00:39 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00