[pyosmium] 01/02: Merge tag 'upstream/0.0_20150331-2a93d5b'

[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 d93cd0e6e30832db124189f27385d58e31b5d556
Merge: bcd1c59 73380a7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 31 23:36:52 2015 +0200

    Merge tag 'upstream/0.0_20150331-2a93d5b'
    
    Upstream version 0.0~20150331-2a93d5b

 doc/Makefile             | 177 ++++++++++++++++++++++++++++
 doc/conf.py              | 273 +++++++++++++++++++++++++++++++++++++++++++
 doc/index.rst            |  21 ++++
 doc/intro.rst            |   6 +
 doc/ref_geom.rst         |  17 +++
 doc/ref_index.rst        |  23 ++++
 doc/ref_io.rst           |  12 ++
 doc/ref_osm.rst          |  95 +++++++++++++++
 doc/ref_osmium.rst       |  23 ++++
 doc/reference.rst        |  16 +++
 lib/generic_handler.hpp  |  14 ++-
 lib/geom.cc              |  41 +++++--
 lib/index.cc             |  34 ++++--
 lib/io.cc                |  22 +++-
 lib/osm.cc               | 299 ++++++++++++++++++++++++++++++++++++++---------
 lib/osmium.cc            |  36 ++++--
 lib/std_pair.hpp         |  43 +++++++
 osmium/__init__.py       |   8 +-
 osmium/geom/__init__.py  |   1 +
 osmium/index/__init__.py |   1 +
 osmium/io/__init__.py    |   1 +
 osmium/osm/__init__.py   |   1 +
 setup.py                 |  18 ++-
 test/test_helper.py      |  33 ++++--
 test/test_osm.py         |  86 ++++++++++++--
 25 files changed, 1190 insertions(+), 111 deletions(-)

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