Blake Thompson b2c1c86d99 Merge branch 'master' into release/image_data_Any ... Conflicts: benchmark/test_polygon_clipping.cpp		2015-02-16 14:37:01 -06:00
..
mapnik	Merge branch 'master' into release/image_data_Any	2015-02-16 14:37:01 -06:00
build.py	refactor markers placements	2014-07-29 11:52:39 +00:00