[mapnik-vector-tile] 02/04: Merge tag 'upstream/1.0.5+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 6642735420e429490218a22068dee72949ad1c7e
Merge: 097c68e c3fc3ec
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 25 00:21:07 2016 +0100

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

 .npmignore                              |   1 +
 .travis.yml                             |   6 ++-
 CHANGELOG.md                            |   5 ++
 Makefile                                |   2 +-
 bench/vtile-decode.cpp                  |   2 +-
 bench/vtile-encode.cpp                  |   2 +-
 bench/vtile-transform.cpp               |   2 +-
 bin/vtile-edit.cpp                      |   2 +-
 bootstrap.sh                            |   7 ++-
 package.json                            |   2 +-
 src/vector_tile_geometry_intersects.cpp |   2 -
 src/vector_tile_geometry_intersects.hpp |  55 ---------------------
 src/vector_tile_geometry_intersects.ipp |  84 --------------------------------
 src/vector_tile_processor.ipp           |   1 -
 test/data/0.0.0.vector-b.mvt            | Bin 2840 -> 2840 bytes
 test/geometry_visual_test.cpp           |   2 +-
 test/test_utils.cpp                     |   4 +-
 test/utils/geometry_equal.hpp           |  34 ++++++-------
 test/vector_tile.cpp                    |   2 +-
 test/vector_tile_pbf.cpp                |   2 +-
 20 files changed, 42 insertions(+), 175 deletions(-)

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