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

[Bas 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 d5fd234f92a0904131278c06b2c796f232a4768c
Merge: 54e23f7 033de56
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 5 23:41:14 2016 +0200

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

 .travis.yml                                        |   7 ++
 CHANGELOG.md                                       |   4 +
 package.json                                       |   4 +-
 src/mapnik_vector_tile.cpp                         |   8 +-
 test/data/vector_tile/compositing/badtile.mvt      | Bin 0 -> 3056 bytes
 test/data/vector_tile/compositing/badtile.xml      |  97 +++++++++++++++++++++
 .../vector_tile/compositing/expected/2-1-1b.png    | Bin 154481 -> 154578 bytes
 .../expected/world-reencode-max-extent.png         | Bin 7991 -> 7990 bytes
 .../compositing/expected/world-reencode.png        | Bin 7983 -> 7981 bytes
 test/vector-tile.composite.test.js                 |  17 ++++
 test/vector-tile.test.js                           |   2 +-
 11 files changed, 132 insertions(+), 7 deletions(-)

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