[mapnik-vector-tile] 02/04: Merge tag 'upstream/1.1.2+dfsg'

[Sebastiaan Couwenberg]

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

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

commit cbd881610155f9e4634b99b87442b990a1b9d3df
Merge: 61d350f 0959cd6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 18 22:22:49 2016 +0200

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

 CHANGELOG.md                                   |   4 ++++
 package.json                                   |   2 +-
 src/vector_tile_geometry_decoder.hpp           |   1 -
 src/vector_tile_geometry_decoder.ipp           |  14 ++++++++++--
 src/vector_tile_layer.hpp                      |   9 +++++++-
 test/data/image.mvt                            | Bin 0 -> 146098 bytes
 test/unit/encoding/geometry_to_feature_pbf.cpp |   1 -
 test/unit/load/merge.cpp                       |  29 ++++++++++++++++++++++++-
 8 files changed, 53 insertions(+), 7 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-vector-tile.git