[protozero] 02/05: Merge tag 'upstream/1.5.1'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository protozero.

commit 4fb8b467df6e1c471d655a0cdb07baf9a9a4f64f
Merge: 3e2b83a 90cfd8d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 14 11:18:15 2017 +0100

    Merge tag 'upstream/1.5.1'
    
    Upstream version 1.5.1

 .travis.yml                             |  5 +--
 CHANGELOG.md                            | 14 +++++++-
 CONTRIBUTING.md                         |  3 +-
 Makefile                                |  2 +-
 UPGRADING.md                            |  6 ++++
 doc/advanced.md                         | 57 +++++++++++++++++++++++++++++--
 include/protozero/byteswap.hpp          |  2 +-
 include/protozero/pbf_builder.hpp       |  2 +-
 include/protozero/pbf_reader.hpp        |  4 +--
 include/protozero/varint.hpp            |  2 +-
 include/protozero/version.hpp           |  5 ++-
 package.json                            |  2 +-
 test/t/tag_and_type/data-combined.pbf   |  3 ++
 test/t/tag_and_type/data-not-packed.pbf |  2 ++
 test/t/tag_and_type/data-packed.pbf     |  2 ++
 test/t/tag_and_type/test_cases.cpp      | 59 +++++++++++++++++++++++++++++++++
 test/t/tag_and_type/testcase.cpp        | 42 +++++++++++++++++++++++
 test/t/tag_and_type/testcase.proto      | 15 +++++++++
 18 files changed, 211 insertions(+), 16 deletions(-)

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