This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik.
commit 95f72c81c5fb0ce6a866b2b1bb3410dfbf434851 Merge: e0d6f91 a84fefb Author: Bas Couwenberg <[email protected]> Date: Thu Aug 18 19:51:56 2016 +0200 Merge tag 'upstream/3.0.12_rc4+ds' Upstream version 3.0.12~rc4+ds bootstrap.sh | 4 +-- demo/c++/rundemo.cpp | 2 +- include/mapnik/feature_kv_iterator.hpp | 3 +- include/mapnik/feature_layer_desc.hpp | 9 ++++++ include/mapnik/featureset.hpp | 14 ++++++--- plugins/input/csv/csv_datasource.cpp | 2 +- plugins/input/geojson/geojson_datasource.cpp | 19 ++++++------ plugins/input/geojson/geojson_datasource.hpp | 2 +- plugins/input/ogr/ogr_datasource.cpp | 4 +-- plugins/input/pgraster/pgraster_datasource.cpp | 6 ++-- plugins/input/postgis/postgis_datasource.cpp | 6 ++-- plugins/input/raster/raster_datasource.cpp | 2 +- plugins/input/sqlite/sqlite_datasource.cpp | 4 +-- plugins/input/topojson/topojson_datasource.cpp | 2 +- src/map.cpp | 2 +- src/svg/svg_parser.cpp | 1 - test/unit/datasource/geojson.cpp | 43 +++++++++++++++++++++++--- 17 files changed, 86 insertions(+), 39 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
