[osmium-tool] 03/06: Merge tag 'upstream/1.3.0'

[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 3c54de47e8238595ec869a84faa32f7c610ad9bd
Merge: 69e72ea c8e5ea4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 18 22:32:45 2015 +0100

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0

 .gitattributes                           |   5 +
 CHANGELOG.md                             |  18 ++-
 CMakeLists.txt                           |   5 +-
 README.md                                |   1 +
 cmake/FindOsmium.cmake                   |  13 +-
 man/osmium-apply-changes.md              |   6 +
 man/osmium-cat.md                        |   6 +
 man/osmium-changeset-filter.md           | 117 ++++++++++++++++
 man/osmium-check-refs.md                 |   2 +
 man/osmium-file-formats.md               |  17 +--
 man/osmium-fileinfo.md                   |   2 +
 man/osmium-getid.md                      |   6 +
 man/osmium-merge-changes.md              |   6 +
 man/osmium-renumber.md                   |   6 +
 man/{osmium-getid.md => osmium-sort.md}  |  27 ++--
 man/osmium-time-filter.md                |   6 +
 man/osmium.md                            |  14 ++
 src/cmd.hpp                              |  13 +-
 src/command_apply_changes.cpp            |  24 ++--
 src/command_cat.cpp                      |  25 ++--
 src/command_changeset_filter.cpp         | 232 +++++++++++++++++++++++++++++++
 src/command_changeset_filter.hpp         |  60 ++++++++
 src/command_check_refs.cpp               |  12 +-
 src/command_fileinfo.cpp                 |   9 +-
 src/command_getid.cpp                    |  45 +++---
 src/command_merge_changes.cpp            |  29 ++--
 src/command_renumber.cpp                 |  30 ++--
 src/command_sort.cpp                     | 122 ++++++++++++++++
 src/command_sort.hpp                     |  48 +++++++
 src/command_time_filter.cpp              |  59 +++++---
 src/io.cpp                               |  41 +++++-
 src/main.cpp                             |   2 +-
 test/changeset-filter/CMakeLists.txt     |  70 ++++++++++
 test/changeset-filter/input-open.osm     |   7 +
 test/changeset-filter/input1.osm         |  10 ++
 test/changeset-filter/output-empty.osm   |   3 +
 test/changeset-filter/output-open.osm    |   7 +
 test/changeset-filter/output1-all.osm    |  10 ++
 test/changeset-filter/output1-first.osm  |   6 +
 test/changeset-filter/output1-second.osm |   7 +
 test/sort/CMakeLists.txt                 |  26 ++++
 test/sort/input-bounds1.osm              |  16 +++
 test/sort/input-bounds2.osm              |  11 ++
 test/sort/input-change.osc               |  19 +++
 test/sort/input-history1.osm             |  12 ++
 test/sort/input-history2.osm             |   7 +
 test/sort/input-simple1.osm              |  15 ++
 test/sort/input-simple2.osm              |  10 ++
 test/sort/output-bounds.osm              |  23 +++
 test/sort/output-change.osc              |  19 +++
 test/sort/output-history.osm             |  16 +++
 test/sort/output-simple.osm              |  22 +++
 zsh_completion/_osmium                   |  38 ++++-
 53 files changed, 1201 insertions(+), 161 deletions(-)

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