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
..
cpp_tests	fix -Wshadow warning	2013-01-03 18:03:26 -08:00
data	tests for 64bit id handling in osm.input	2013-01-02 17:39:12 -08:00
python_tests	Merge commit '32760318a4905efa45bb459d891e5e7ec1a7bf2a' into harfbuzz	2013-03-16 13:19:06 +01:00
visual_tests	Merge commit '6b7c16297032aa24bab0950b2a837e58c7d52c86' into harfbuzz	2013-03-16 13:13:14 +01:00
run_tests.py	Reenable "name" tests.	2012-09-23 02:52:49 +02:00