[mapnik-vector-tile] 02/04: Merge tag 'upstream/1.0.4+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 cf148a04d9fb7fae117e0cf0c9bb2094f60e819c
Merge: 389c523 10fe625
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 11 13:29:40 2016 +0100

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

 CHANGELOG.md                                   |   5 +++
 Makefile                                       |   2 +-
 bench/vtile-transform.cpp                      |   1 +
 package.json                                   |   2 +-
 src/vector_tile_geometry_feature.hpp           |   8 ++--
 test/data/0.0.0.vector-b.mvt                   | Bin 2835 -> 2840 bytes
 test/data/simplified_geometry.geojson          |   1 +
 test/data/simplified_geometry_pbf.geojson      |   1 +
 test/test_utils.cpp                            |   1 +
 test/unit/encoding/geometry_to_feature_pbf.cpp |  50 +++++++++++++++++++++++++
 test/vector_tile.cpp                           |  18 ++++++++-
 test/vector_tile_pbf.cpp                       |  15 +++++++-
 test/vector_tile_rasterize.cpp                 |   2 +-
 13 files changed, 95 insertions(+), 11 deletions(-)

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