Jordan Hollinger ee692eea73 Merge branch 'master' of github.com:mapnik/mapnik into group-markers ... Conflicts: include/mapnik/grid/grid_marker_helpers.hpp include/mapnik/marker_helpers.hpp include/mapnik/renderer_common/process_group_symbolizer.hpp src/cairo/process_markers_symbolizer.cpp src/renderer_common/process_group_symbolizer.cpp tests/visual_tests/images/group-symbolizer-1-512-512-1.0-agg-reference.png tests/visual_tests/images/group-symbolizer-1-512-512-1.0-cairo-reference.png tests/visual_tests/images/group-symbolizer-1-512-512-2.0-agg-reference.png tests/visual_tests/images/group-symbolizer-1-512-512-2.0-cairo-reference.png		2014-10-27 09:29:45 -04:00
..
mapnik	Merge branch 'master' of github.com:mapnik/mapnik into group-markers	2014-10-27 09:29:45 -04:00
build.py	refactor markers placements	2014-07-29 11:52:39 +00:00