[mapnik-vector-tile] 02/06: Merge tag 'upstream/1.2.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 mapnik-vector-tile.

commit 0d5b2f5e7a43a7db2a5735ca3afb7e9922608aec
Merge: fe902da fd9578d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 12 09:42:24 2016 +0200

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

 .travis.yml                          | 14 ++++++++---
 CHANGELOG.md                         |  5 ++++
 CONTRIBUTING.md                      |  4 +--
 Makefile                             |  2 +-
 bootstrap.sh                         | 49 ++++++++++++++++++++++++------------
 include_dirs.js                      |  2 ++
 package.json                         |  4 +--
 src/vector_tile_composite.hpp        |  8 +++---
 src/vector_tile_datasource_pbf.ipp   |  6 ++---
 src/vector_tile_featureset_pbf.ipp   | 12 ++++-----
 src/vector_tile_geometry_decoder.cpp | 16 ++++++++++++
 src/vector_tile_geometry_decoder.hpp |  6 +++--
 src/vector_tile_geometry_decoder.ipp | 35 +++++++++++++-------------
 src/vector_tile_is_valid.hpp         |  2 +-
 src/vector_tile_load_tile.hpp        | 10 ++++----
 test/geometry_visual_test.cpp        |  2 +-
 test/unit/load/merge.cpp             | 18 ++++++-------
 test/utils/encoding_util.cpp         |  2 +-
 test/utils/round_trip.cpp            |  2 +-
 test/vector_tile.cpp                 |  2 +-
 test/vector_tile_pbf.cpp             |  2 +-
 21 files changed, 126 insertions(+), 77 deletions(-)

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