Dane Springmeyer dc5b9202ac Merge branch 'master' of github.com:mapnik/mapnik into layer-opacity ... Conflicts: src/layer.cpp		2014-10-03 00:14:41 -07:00
..
mapnik	Merge branch 'master' of github.com:mapnik/mapnik into layer-opacity	2014-10-03 00:14:41 -07:00
build.py	refactor markers placements	2014-07-29 11:52:39 +00:00