Blake Thompson 08c675e1a4 Merge branch 'master' into bugfix/image_util_impl ... Conflicts: include/mapnik/image_view.hpp src/image_util.cpp		2015-01-08 20:25:15 -05:00
..
mapnik	Merge branch 'master' into bugfix/image_util_impl	2015-01-08 20:25:15 -05:00
build.py	refactor markers placements	2014-07-29 11:52:39 +00:00