artemp 33661c818d Merge branch 'mapnik-geometry' into mapnik-geometry-template ... Conflicts: benchmark/test_polygon_clipping.cpp include/mapnik/geometry.hpp include/mapnik/geometry_adapters.hpp include/mapnik/marker_helpers.hpp		2015-04-10 14:52:40 +02:00
..
input	Merge branch 'mapnik-geometry' into mapnik-geometry-template	2015-04-10 14:52:40 +02:00