This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik.
commit c4c5df3d078991e8c09b6f2c02047044da41e9cc
Merge: 7d3dff6 852ec99
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Nov 29 20:51:02 2017 +0100
Merge tag 'upstream/3.0.17+ds'
Upstream version 3.0.17+ds
.travis.yml | 10 +++-
CHANGELOG.md | 9 +++
README.md | 2 +-
SConstruct | 69 ++++++++++++----------
bootstrap.sh | 17 +++---
circle.yml | 1 +
demo/viewer/build.py | 2 +-
include/mapnik/version.hpp | 2 +-
plugins/input/csv/build.py | 2 +-
plugins/input/geojson/build.py | 2 +-
plugins/input/pgraster/build.py | 2 +-
plugins/input/postgis/build.py | 2 +-
plugins/input/topojson/build.py | 2 +-
scripts/check_glibcxx.sh | 36 +++++++++++
src/build.py | 21 ++++---
src/font_engine_freetype.cpp | 1 +
.../mapnik/version.hpp => src/glibc_workaround.cpp | 34 +++++++----
src/text/renderer.cpp | 17 +++---
utils/mapnik-config/build.py | 6 +-
19 files changed, 154 insertions(+), 83 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mapnik.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
