[osmium-tool] 02/04: Merge tag 'upstream/1.0.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 c59b2e1944cf7a4ab269ad60085d4255e29b55ae
Merge: 2cdfa38 7a5015d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 31 23:00:04 2015 +0200

    Merge tag 'upstream/1.0.1'
    
    Upstream version 1.0.1
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/osmium-tool.install
    	debian/rules

 .gitignore                           |  4 ----
 .ycm_extra_conf.py                   |  6 +++++-
 CHANGELOG.md                         | 18 ++++++++++++++++
 CMakeLists.txt                       | 41 +++++++++++++++++-------------------
 README.md                            | 12 ++---------
 debian/.gitignore                    |  4 ----
 doc/.gitignore                       |  2 --
 doc/Makefile                         | 32 ----------------------------
 fix-formatting.sh                    |  7 ++++++
 {doc => man}/manpage.template        |  4 +---
 {doc => man}/osmium-apply-changes.md | 36 +++++++++++++++----------------
 {doc => man}/osmium-cat.md           | 38 ++++++++++++++++-----------------
 {doc => man}/osmium-file-formats.md  | 11 ++++++----
 {doc => man}/osmium-fileinfo.md      | 10 ++++-----
 {doc => man}/osmium-merge-changes.md | 34 ++++++++++++++----------------
 {doc => man}/osmium-time-filter.md   | 34 ++++++++++++++----------------
 {doc => man}/osmium.md               |  8 +++----
 src/main.cpp                         |  2 +-
 18 files changed, 134 insertions(+), 169 deletions(-)

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