[mapnik-vector-tile] 02/04: Merge tag 'upstream/1.1.0+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 d0187c7dd3e5b8603a80c236090c97cc23ddb026
Merge: be5ae48 bc20576
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 13 07:34:33 2016 +0200

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

 .travis.yml                             |  4 ++
 CHANGELOG.md                            |  6 +++
 package.json                            |  2 +-
 src/vector_tile_featureset_pbf.ipp      |  2 +-
 src/vector_tile_geometry_clipper.hpp    |  1 -
 src/vector_tile_geometry_simplifier.hpp |  1 -
 src/vector_tile_is_valid.hpp            | 29 ++++-------
 src/vector_tile_load_tile.hpp           | 86 +++++++++++++++++++++++----------
 src/vector_tile_merc_tile.hpp           |  2 +-
 test/unit/load/merge.cpp                | 68 ++++++++++++++++++++++++++
 test/utils/encoding_util.cpp            |  3 +-
 test/vector_tile_pbf.cpp                | 40 +++++++--------
 12 files changed, 174 insertions(+), 70 deletions(-)

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