Dane Springmeyer 49aadae244 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 ...

Conflicts:
	tests/visual_tests/test.py

2014-01-17 20:04:09 -08:00

..

csv

csv plugin: fix syntax after merge

2013-11-03 23:17:40 -08:00

gdal

Merge branch 'master' of github.com:mapnik/mapnik into expr-v2

2014-01-17 20:04:09 -08:00

geojson

geojson - feature_collection_parser

2013-11-04 12:39:10 +00:00

occi

c++11 : use nullptr instead of NULL

2013-11-27 15:54:16 +00:00

ogr

symbolizer-expressions replayed against latest master

2013-11-27 22:50:15 -08:00

osm

symbolizer-expressions replayed against latest master

2013-11-27 22:50:15 -08:00

postgis

c++11 : use nullptr instead of NULL

2013-11-27 15:54:16 +00: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

scons: simplify linkflags/ldflags setting / attempt to fix #2025

2013-10-22 16:35:46 -04:00

shape

avoid dereferencing pointer more than once

2013-12-11 07:27:51 -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