Hermann Kraus 7d34fb489a Large merge with a lot of manual edits. ... Test for grid renderer are failing atm. Merge commit 'e66d00762754d1204204ccf122955116e5e9d017' into harfbuzz Conflicts: include/mapnik/font_engine_freetype.hpp src/agg/process_shield_symbolizer.cpp src/agg/process_text_symbolizer.cpp src/font_engine_freetype.cpp src/grid/process_shield_symbolizer.cpp src/grid/process_text_symbolizer.cpp src/text_symbolizer.cpp src/xml_tree.cpp		2013-03-20 03:47:20 +01:00
..
mapnik	Large merge with a lot of manual edits.	2013-03-20 03:47:20 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00