[osmium-tool] 02/05: Merge tag 'upstream/1.6.1'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmium-tool.

commit 63445bc633f0f20f10949f2a002f600faf3011d4
Merge: 0a2c64f 0b8f3bc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 10 19:56:00 2017 +0200

    Merge tag 'upstream/1.6.1'
    
    Upstream version 1.6.1

 CHANGELOG.md                        | 18 +++++++++++-
 CMakeLists.txt                      |  4 +--
 README.md                           |  2 +-
 man/osmium-derive-changes.md        |  5 ++++
 man/osmium-diff.md                  |  5 +++-
 man/osmium-show.md                  |  2 +-
 src/cmd.cpp                         | 15 ++++++----
 src/cmd.hpp                         |  6 ++--
 src/command_apply_changes.cpp       |  5 +++-
 src/command_cat.cpp                 |  2 +-
 src/command_diff.cpp                |  2 +-
 src/command_extract.cpp             |  1 -
 src/command_renumber.cpp            |  2 +-
 src/command_show.cpp                | 34 +++++++++++++++++------
 src/command_show.hpp                |  3 ++
 src/exception.hpp                   | 30 ++++++++++++++++++++
 src/extract/error.hpp               | 55 -------------------------------------
 src/extract/geojson_file_parser.cpp |  2 +-
 src/extract/poly_file_parser.cpp    |  2 +-
 test/extract/test_unit.cpp          |  2 +-
 20 files changed, 110 insertions(+), 87 deletions(-)

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