[pyosmium] 03/10: Merge tag 'upstream/2.6.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit fb318e93105138b251a88a6a69db374edc3880eb
Merge: c3c8e7e fdbfe20
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 6 20:22:02 2016 +0100

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0

 CHANGELOG.md                  |  19 ++-
 README.md                     |   2 +-
 doc/conf.py                   |   6 +-
 doc/intro.rst                 |  75 +++++++++++-
 doc/ref_osm.rst               |  33 ++++-
 doc/ref_osmium.rst            |  28 ++++-
 examples/convert.py           |  37 ++++++
 examples/filter_coastlines.py |  56 +++++++++
 examples/normalize_boolean.py |  66 ++++++++++
 lib/generic_handler.hpp       |   4 +-
 lib/generic_writer.hpp        | 278 ++++++++++++++++++++++++++++++++++++++++++
 lib/geom.cc                   |   2 +-
 lib/index.cc                  |   2 +-
 lib/io.cc                     |   2 +-
 lib/osm.cc                    |  20 +--
 lib/osmium.cc                 |  43 ++++++-
 osmium/__init__.py            |   2 +-
 osmium/geom/__init__.py       |   1 -
 osmium/index/__init__.py      |   1 -
 osmium/io/__init__.py         |   1 -
 osmium/osm/__init__.py        |  14 +++
 osmium/osm/mutable.py         |  75 ++++++++++++
 setup.py                      |  15 ++-
 test/test_osm.py              |  23 +++-
 test/test_writer.py           | 142 +++++++++++++++++++++
 25 files changed, 900 insertions(+), 47 deletions(-)

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