This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik.
commit d5339529c16f236e1f946b20928b4235e26c083e
Merge: 4c8f41b 48e5ccb
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Aug 10 12:34:24 2016 +0200
Merge tag 'upstream/3.0.12_rc2+ds'
Upstream version 3.0.12~rc2+ds
.travis.yml | 4 ++--
bootstrap.sh | 25 ++++++++++++++++++-------
circle.yml | 2 +-
include/mapnik/cairo/cairo_context.hpp | 4 ++++
include/mapnik/cairo/cairo_renderer.hpp | 1 +
src/cairo/cairo_context.cpp | 18 ++++++++++++++++++
src/cairo/cairo_renderer.cpp | 31 ++++++++++++++++++++++++++-----
src/expression_node.cpp | 4 ++--
src/load_map.cpp | 2 +-
src/map.cpp | 2 +-
src/marker_cache.cpp | 2 +-
test/unit/core/expressions_test.cpp | 18 +++++++++++++++---
12 files changed, 90 insertions(+), 23 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
