Dane Springmeyer f998b2bda6 Merge branch '2.3.x' of github.com:mapnik/mapnik ... Conflicts: deps/agg/build.py deps/clipper/build.py include/mapnik/feature_style_processor_impl.hpp plugins/input/csv/csv_datasource.cpp		2013-11-03 23:10:21 -08:00
..
build.py	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
geojson_datasource.cpp	geojson plugin: simplify code	2013-10-29 00:34:42 -07:00
geojson_datasource.hpp	apply 116706fd1c fix - ref #2048	2013-10-23 15:26:43 +01:00
geojson_featureset.cpp	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-03 23:10:21 -08:00
geojson_featureset.hpp	remove unused member variable	2013-10-23 17:44:04 +01:00