[Pkg-javascript-commits] [node-mapnik] 02/17: Merge tag 'upstream/3.5.12+dfsg'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository node-mapnik.

commit 795f9a86f4397b68e69bcda84ef072c83cb7512b
Merge: 6b68e0d 7319629
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 8 23:17:30 2016 +0200

    Merge tag 'upstream/3.5.12+dfsg'
    
    Upstream version 3.5.12+dfsg

 .travis.yml                                        |  35 ++-
 CHANGELOG.md                                       |  19 ++
 deps/clipper/clipper.cpp                           |  22 +-
 package.json                                       |   4 +-
 scripts/build-appveyor.bat                         |   1 -
 scripts/is_pr_merge.sh                             |  27 +++
 scripts/publish.sh                                 |  26 ++
 src/mapnik_vector_tile.cpp                         | 269 ++++++++++++++++-----
 test/data/vector_tile/compositing/25084.vector.pbf | Bin 0 -> 10847 bytes
 .../vector_tile/compositing/25084_2.vector.pbf     | Bin 0 -> 4623 bytes
 .../vector_tile/compositing/expected/2-1-1b.png    | Bin 154578 -> 154481 bytes
 .../expected/world-reencode-max-extent.png         | Bin 7991 -> 7991 bytes
 .../compositing/expected/world-reencode.png        | Bin 7984 -> 7983 bytes
 test/vector-tile.composite.test.js                 |  16 ++
 test/vector-tile.test.js                           |  34 ++-
 15 files changed, 366 insertions(+), 87 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git