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
..
build.py	scons: simplify linkflags/ldflags setting / attempt to fix #2025	2013-10-22 16:35:46 -04:00
gdal_datasource.cpp	further gdal nodata handling improvements - refs #2023	2014-01-17 19:46:35 -08:00
gdal_datasource.hpp	further gdal nodata handling improvements - refs #2023	2014-01-17 19:46:35 -08:00
gdal_featureset.cpp	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2014-01-17 20:04:09 -08:00
gdal_featureset.hpp	further gdal nodata handling improvements - refs #2023	2014-01-17 19:46:35 -08:00