[Pkg-javascript-commits] [node-mapnik] 03/10: Merge tag 'upstream/3.6.2+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 c286c29ecad8c2ad87eb876fa7d1ffae275d5fbd
Merge: 1ef1e5b 8fb7ac7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 29 13:48:43 2017 +0200

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

 .gitignore                                         |   1 +
 .travis.yml                                        |  16 +++-
 CHANGELOG.md                                       |  21 +++++
 Makefile                                           |   6 +-
 appveyor.yml                                       |  34 ++++----
 common.gypi                                        |   3 +-
 install_mason.sh                                   |   4 +-
 package.json                                       |   7 +-
 scripts/build-appveyor.bat                         |  97 +++++++--------------
 test/data/images/14_2788_6533.webp                 | Bin 0 -> 98618 bytes
 test/data/images/large_overzoom.expected.png       | Bin 0 -> 859 bytes
 .../images/sat_image-expected-100x100-offset.tif   | Bin 4496 -> 4500 bytes
 .../images/sat_image-expected-50x50-offset.tif     | Bin 760 -> 718 bytes
 test/data/large_overzoom.xml                       |  40 +++++++++
 test/data/sat_map.xml                              |   2 +-
 .../vector_tile/compositing/expected/2-1-1b.png    | Bin 154630 -> 154739 bytes
 test/data/vector_tile/tile-raster.expected.jpg     | Bin 6635 -> 5247 bytes
 test/geometry.test.js                              |  14 ---
 test/image.test.js                                 |   4 +-
 test/vector-tile.query.test.js                     |   2 +-
 test/vector-tile.test.js                           |  59 ++++++++++---
 21 files changed, 188 insertions(+), 122 deletions(-)

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