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
..
cpp_tests	Merge branch 'peucker' of git://github.com/MapQuest/mapnik into MapQuest-peucker	2014-10-24 15:20:05 +01:00
data	fix back compat for text-placement-type:dummy - closes #2502	2014-10-06 11:37:39 -07:00
python_tests	quiet use of mapnik-test-data	2014-10-20 22:43:17 -07:00
visual_tests	Merge branch 'master' of github.com:mapnik/mapnik into group-markers	2014-10-27 09:29:45 -04:00
run_tests.py	python tests: remove either paths.py data or env settings for fonts/plugins	2014-10-15 18:40:07 -07:00