[libosmium] 02/05: Merge tag 'upstream/2.1.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository libosmium.

commit 49df175b298b6cd7f09f175ef8db819a127173b2
Merge: 241141e 25f004d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 31 22:41:12 2015 +0200

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0

 .gitignore                                         |  2 -
 .ycm_extra_conf.py                                 | 10 ++-
 CHANGELOG.md                                       | 31 +++++++
 CMakeLists.txt                                     |  2 +-
 doc/Doxyfile.in                                    |  6 +-
 include/osmium/area/multipolygon_collector.hpp     |  2 +-
 include/osmium/builder/builder.hpp                 |  3 +-
 include/osmium/handler/node_locations_for_ways.hpp |  6 +-
 include/osmium/index/map.hpp                       |  3 +-
 include/osmium/index/multimap.hpp                  |  3 +-
 include/osmium/io/detail/pbf_input_format.hpp      | 51 ++++++++----
 include/osmium/io/detail/pbf_output_format.hpp     | 36 +++++++-
 include/osmium/io/detail/pbf_stringtable.hpp       | 42 ++++++----
 include/osmium/io/detail/xml_input_format.hpp      | 20 ++++-
 include/osmium/io/reader.hpp                       |  2 +-
 include/osmium/memory/item.hpp                     |  3 +-
 include/osmium/osm/area.hpp                        | 39 +++++++--
 include/osmium/osm/box.hpp                         | 77 ++++++++++++++----
 include/osmium/osm/changeset.hpp                   |  3 +-
 include/osmium/osm/node_ref_list.hpp               | 95 ++++++++++++++++------
 include/osmium/osm/way.hpp                         |  6 +-
 test/data-tests/testdata-xml.cpp                   | 95 +++++++++++++++++++++-
 test/t/basic/test_box.cpp                          | 16 +++-
 23 files changed, 434 insertions(+), 119 deletions(-)

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