Dane Springmeyer 6433d9482e Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 ... Conflicts: include/mapnik/symbolizer.hpp src/agg/agg_renderer.cpp src/agg/process_line_pattern_symbolizer.cpp src/agg/process_line_symbolizer.cpp src/agg/process_polygon_pattern_symbolizer.cpp src/agg/process_polygon_symbolizer.cpp src/cairo_renderer.cpp src/feature_type_style.cpp src/grid/process_line_pattern_symbolizer.cpp src/grid/process_line_symbolizer.cpp src/grid/process_markers_symbolizer.cpp src/grid/process_polygon_pattern_symbolizer.cpp src/grid/process_polygon_symbolizer.cpp		2014-03-10 00:05:56 -07:00
..
csv	minimum boost version is 1.47 - remove obsolete code handling older versions	2014-01-27 13:19:21 -08:00
gdal	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2014-03-10 00:05:56 -07:00
geojson	minimum boost version is 1.47 - remove obsolete code handling older versions	2014-01-27 13:19:21 -08:00
occi	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
ogr	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2014-03-10 00:05:56 -07:00
osm	symbolizer-expressions replayed against latest master	2013-11-27 22:50:15 -08:00
postgis	Do not attempt to PQclear a null PQresult*	2014-03-09 21:07:34 -07:00
python	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-03 23:10:21 -08:00
raster	symbolizer-expressions replayed against latest master	2013-11-27 22:50:15 -08:00
rasterlite	more consistent memset/memcpy usage	2014-01-28 15:05:10 -08:00
shape	attempt to handle multi-polygons in shape.input	2014-02-24 15:20:06 +00: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	minimum boost version is 1.47 - remove obsolete code handling older versions	2014-01-27 13:19:21 -08:00