Dane Springmeyer 03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik ... Conflicts: src/deepcopy.cpp src/expression.cpp src/rule.cpp		2013-11-13 20:00:13 -08:00
..
csv	csv plugin: fix syntax after merge	2013-11-03 23:17:40 -08:00
gdal	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
geojson	geojson - feature_collection_parser	2013-11-04 12:39:10 +00:00
occi	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
ogr	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-07 18:16:10 -08:00
osm	consistenly use std::memcpy and std::memset	2013-11-09 23:02:24 -08:00
postgis	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-13 20:00:13 -08:00
python	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-03 23:10:21 -08:00
raster	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
rasterlite	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
shape	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-03 23:10:21 -08:00
sqlite	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
templates	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
topojson	topojson: built up knowledge of attributes and geometry type + tests	2013-10-29 00:37:41 -07:00