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

main.cpp

+ replace <boost/shared_ptr.hpp> with <memory>

2013-09-20 14:13:23 +01:00

pgsql2sqlite.hpp

fix compile of pgsql2sqlite

2013-09-23 11:37:16 -07:00

sqlite.cpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

sqlite.hpp

+ replace <boost/shared_ptr.hpp> with <memory>

2013-09-20 14:13:23 +01:00