[mapnik] 03/05: Merge tag 'upstream/3.0.12+ds'
Bas Couwenberg
sebastic at debian.org
Thu Sep 8 14:52:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik.
commit b99f2144e9c057892f5ac104d1fb8682450e2ef2
Merge: c58df65 1335c79
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Sep 8 15:17:22 2016 +0200
Merge tag 'upstream/3.0.12+ds'
Upstream version 3.0.12+ds
.travis.yml | 4 +-
CHANGELOG.md | 8 +-
Makefile | 3 +
appveyor.yml | 1 -
include/mapnik/image.hpp | 1 -
include/mapnik/image_impl.hpp | 40 ++++----
include/mapnik/warning_ignore.hpp | 2 -
scripts/build-appveyor.bat | 11 ++-
scripts/build-local.bat | 5 -
scripts/ensure_test_data.sh | 24 +++--
scripts/get-boost-icu-version-from-sdk.ps1 | 21 +++++
scripts/parse-appveyor-yml.ps1 | 7 --
scripts/publish_release.sh | 147 ++++++++++++++++++++++++-----
scripts/test_release.sh | 65 +++++++++++++
scripts/time-header | 2 +-
test/unit/imaging/image.cpp | 26 +++++
16 files changed, 289 insertions(+), 78 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git
More information about the Pkg-grass-devel
mailing list