Dane Springmeyer 08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik ... Conflicts: bindings/python/mapnik_building_symbolizer.cpp bindings/python/mapnik_debug_symbolizer.cpp bindings/python/mapnik_line_pattern_symbolizer.cpp bindings/python/mapnik_line_symbolizer.cpp bindings/python/mapnik_markers_symbolizer.cpp bindings/python/mapnik_point_symbolizer.cpp bindings/python/mapnik_polygon_symbolizer.cpp bindings/python/mapnik_python.cpp bindings/python/mapnik_raster_symbolizer.cpp bindings/python/mapnik_shield_symbolizer.cpp bindings/python/mapnik_symbolizer.cpp		2013-11-07 09:21:05 -08:00
..
build.py	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-07 09:21:05 -08:00
svg2png.cpp	start centralizing filesystem operations in mapnik::util::fs - refs #1177	2013-06-02 19:28:24 -07:00