[libosmium] 02/04: Merge tag 'upstream/2.12.1' into experimental

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository libosmium.

commit 28808d9cc95b38503ef3ce15cb7de8d9e40d3692
Merge: 9b932a3 17c6b88
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 10 19:53:36 2017 +0200

    Merge tag 'upstream/2.12.1' into experimental
    
    Upstream version 2.12.1

 CHANGELOG.md                                 | 28 ++++++++++++++++++-
 CMakeLists.txt                               |  8 ++++--
 examples/osmium_change_tags.cpp              |  2 +-
 examples/osmium_dump_internal.cpp            |  2 +-
 examples/osmium_index_lookup.cpp             |  6 ++--
 include/osmium/handler/check_order.hpp       | 41 +++++++++++++++++----------
 include/osmium/io/writer.hpp                 |  5 ++++
 include/osmium/memory/buffer.hpp             | 20 +++++++------
 include/osmium/object_pointer_collection.hpp |  3 +-
 include/osmium/relations/collector.hpp       |  5 ++++
 include/osmium/tags/tags_filter.hpp          |  8 ++++++
 include/osmium/util/options.hpp              |  5 ++--
 include/osmium/version.hpp                   |  4 +--
 test/data-tests/testcases/test-100.cpp       | 23 +++++++++------
 test/data-tests/testcases/test-101.cpp       | 22 +++++++++------
 test/data-tests/testcases/test-110.cpp       | 19 ++++++++-----
 test/t/geom/test_projection.cpp              | 42 +++++++++++++++-------------
 test/t/memory/test_buffer_basics.cpp         | 24 ++++++++++++++--
 18 files changed, 184 insertions(+), 83 deletions(-)

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