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
..
contributing.markdown	add lexical cast and sstream notes to contributing docs	2013-01-03 18:58:37 -08:00
design.markdown	now that docs/ is wide-open, start out with a design manifesto	2011-10-12 15:14:42 -07:00
text_layout.gv	Update docs.	2012-07-07 17:41:31 +02:00
text_layout.png	Update docs.	2012-07-07 17:41:31 +02:00
textrendering.gv	Update dependency graph.	2012-01-31 17:39:28 +01:00
textrendering.png	Update dependency graph.	2012-01-31 17:39:28 +01:00
textrendering.svg	Update dependency graph.	2012-01-31 17:39:28 +01:00