Hermann Kraus 4e3e5cb0b0 Merge branch 'master' into harfbuzz ... Conflicts: bindings/python/mapnik_shield_symbolizer.cpp include/mapnik/agg_renderer.hpp include/mapnik/cairo_renderer.hpp src/build.py		2012-07-28 20:59:42 +02:00
..
mapnik	Merge branch 'master' into harfbuzz	2012-07-28 20:59:42 +02:00