Blake Thompson 6e0d6d423b Merge branch 'master' into release/image_data_any ... Conflicts: include/mapnik/grid/grid_marker_helpers.hpp		2015-02-06 16:19:40 -06:00
..
mapnik	Merge branch 'master' into release/image_data_any	2015-02-06 16:19:40 -06:00
build.py	refactor markers placements	2014-07-29 11:52:39 +00:00