Blake Thompson b46f87b385 Merge branch 'master' into sanitize_errors ... Conflicts: include/mapnik/json/positions_grammar.hpp		2016-01-07 08:34:52 -06:00
..
csv	csv.input: fix warning	2015-11-23 08:54:13 +00:00
gdal	ensure consistent, ordered linking for plugins - closes #3105	2015-10-01 13:35:56 -07:00
geojson	GeoJSON - preserve feature ordering with both cache_features=true' and cache_features=false` (#3182)	2015-11-23 10:19:49 +00:00
ogr	suppress -Wshadow warning from ogr	2015-12-03 10:22:02 -05:00
pgraster	fix for santize address errors	2015-12-27 21:40:10 -06:00
postgis	mapnik c++ style	2015-11-18 14:42:29 +00:00
raster	centralize warning suppression	2015-11-07 17:53:09 -08:00
shape	shapeindex : remove duplicate node defs + add default ctor	2016-01-04 13:19:16 +00:00
sqlite	centralize warning suppression	2015-11-07 17:53:09 -08:00
topojson	centralize warning suppression	2015-11-07 17:53:09 -08:00