[osmium-tool] 02/05: Merge tag 'upstream/1.4.1'
Bas Couwenberg
sebastic at debian.org
Sun Nov 20 19:06:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit 32ecf1f8a262dc66091986db0d93c69db6af3b60
Merge: 9ddc335 df80928
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Nov 20 19:55:46 2016 +0100
Merge tag 'upstream/1.4.1'
Upstream version 1.4.1
.travis.yml | 28 +++++++++++
CHANGELOG.md | 33 ++++++++++++-
CMakeLists.txt | 4 +-
README.md | 12 ++---
cmake/FindOsmium.cmake | 62 ++++++++++++++++++------
man/osmium-add-locations-to-ways.md | 9 ++++
man/osmium-derive-changes.md | 2 +-
man/osmium-diff.md | 16 +++++--
man/osmium-getid.md | 2 +
man/osmium-merge.md | 2 +-
src/cmd.hpp | 18 ++++---
src/command_add_locations_to_ways.cpp | 18 +++----
src/command_add_locations_to_ways.hpp | 2 +-
src/command_apply_changes.cpp | 2 +-
src/command_cat.cpp | 8 +---
src/command_cat.hpp | 2 -
src/command_changeset_filter.cpp | 2 +-
src/command_check_refs.cpp | 29 +++++++-----
src/command_derive_changes.cpp | 4 +-
src/command_diff.cpp | 28 +++++------
src/command_fileinfo.cpp | 2 +-
src/command_getid.cpp | 88 ++++++++++++++++-------------------
src/command_getid.hpp | 6 +--
src/command_merge.cpp | 3 +-
src/command_merge_changes.cpp | 3 +-
src/command_renumber.cpp | 12 ++---
src/command_show.cpp | 12 ++---
src/command_sort.cpp | 3 +-
src/command_time_filter.cpp | 3 +-
src/io.cpp | 8 ++++
src/main.cpp | 15 ++++--
test/diff/test_setup.cpp | 10 ++--
test/include/catch.hpp | 50 +++++++++++++-------
test/io/Makefile.in | 11 +++--
34 files changed, 319 insertions(+), 190 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git
More information about the Pkg-grass-devel
mailing list