[osmium-tool] 02/08: Merge tag 'upstream/1.2.1'

[Sebastiaan 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 33fe43edd760b6546ac55f15d48671ba0175a20b
Merge: cf54dbd 92b46a9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 31 16:14:11 2015 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 .travis.yml                         |  2 +-
 CHANGELOG.md                        | 16 ++++++++-
 CMakeLists.txt                      |  4 +--
 appveyor.yml                        | 13 +++----
 cmake/FindOsmium.cmake              | 69 +++++++++++++++----------------------
 cmake/run_test_compare_output.cmake | 16 ++++-----
 scripts/travis_install.sh           |  8 -----
 scripts/travis_script.sh            |  7 ++++
 src/cmd_factory.cpp                 |  2 +-
 src/command_fileinfo.cpp            |  2 +-
 src/command_renumber.cpp            | 11 +++++-
 src/main.cpp                        |  9 +++++
 test/CMakeLists.txt                 | 24 ++++++-------
 test/fileinfo/fi1-result.txt        |  4 +--
 test/renumber/CMakeLists.txt        |  7 +++-
 15 files changed, 107 insertions(+), 87 deletions(-)

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