Hermann Kraus 25d00ad26f Merge commit '32760318a4905efa45bb459d891e5e7ec1a7bf2a' into harfbuzz ... Conflicts: include/mapnik/font_engine_freetype.hpp include/mapnik/text/formatting/base.hpp include/mapnik/text/formatting/list.hpp include/mapnik/text/text_properties.hpp src/font_engine_freetype.cpp src/grid/process_shield_symbolizer.cpp src/symbolizer_helpers.cpp src/text/formatting/expression.cpp src/text/formatting/format.cpp src/text/formatting/list.cpp src/text/text_properties.cpp		2013-03-16 13:19:06 +01:00
..
python	Merge commit '32760318a4905efa45bb459d891e5e7ec1a7bf2a' into harfbuzz	2013-03-16 13:19:06 +01:00