Dane Springmeyer 09b02ddc17 Merge branch 'master' of github.com:mapnik/mapnik into localized-font-cache ... Conflicts: src/build.py		2014-09-30 14:42:01 -07:00
..
mapnik	Merge branch 'master' of github.com:mapnik/mapnik into localized-font-cache	2014-09-30 14:42:01 -07:00
build.py	refactor markers placements	2014-07-29 11:52:39 +00:00