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
..
2013-05-21 08:46:07 -07:00
2013-07-02 16:48:16 -04:00
2013-09-18 19:54:49 -07:00
2013-10-02 09:42:03 +01:00