Hermann Kraus b53849d441 Merge branch 'master' into harfbuzz ... Conflicts: include/mapnik/font_engine_freetype.hpp include/mapnik/symbolizer_helpers.hpp src/agg/process_shield_symbolizer.cpp src/agg/process_text_symbolizer.cpp src/cairo_renderer.cpp src/font_engine_freetype.cpp src/formatting/list.cpp src/grid/process_shield_symbolizer.cpp src/grid/process_text_symbolizer.cpp src/symbolizer_helpers.cpp tests/visual_tests/styles/harfbuzz.xml		2012-07-21 20:19:22 +02:00
..
python	Merge branch 'master' into harfbuzz	2012-07-21 20:19:22 +02:00