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

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository libosmium.

commit 7bd4c35f1be86073109bc46ade2de42d7ff9e26d
Merge: e37bb93 919222e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 26 08:55:44 2017 +0200

    Merge tag 'upstream/2.13.1'
    
    Upstream version 2.13.1

 CHANGELOG.md                                     |  32 ++++-
 CMakeLists.txt                                   |   2 +-
 NOTES_FOR_DEVELOPERS.md                          |  34 ++++-
 appveyor.yml                                     |   8 ++
 build-appveyor.bat                               |   6 +-
 examples/osmium_dump_internal.cpp                |  11 ++
 examples/osmium_index_lookup.cpp                 |  43 ++++--
 examples/osmium_location_cache_create.cpp        |   9 +-
 examples/osmium_location_cache_use.cpp           |   9 +-
 include/osmium/index/detail/mmap_vector_file.hpp |   2 +-
 include/osmium/io/detail/input_format.hpp        |  16 +--
 include/osmium/io/detail/opl_input_format.hpp    |  98 +++++++------
 include/osmium/io/detail/output_format.hpp       |  30 ++++
 include/osmium/io/file.hpp                       |   3 +
 include/osmium/io/file_format.hpp                |  17 ++-
 include/osmium/thread/pool.hpp                   |   2 +-
 include/osmium/util/file.hpp                     |  46 ++++++-
 include/osmium/util/memory_mapping.hpp           |   2 +-
 include/osmium/version.hpp                       |   4 +-
 test/examples/CMakeLists.txt                     |  33 ++++-
 test/examples/t/change_tags/.gitattributes       |   1 +
 test/examples/t/dump_internal/CMakeLists.txt     |  45 +++---
 test/t/io/data-cr.opl                            |   1 +
 test/t/io/test_file_formats.cpp                  |  40 ++++++
 test/t/io/test_opl_parser.cpp                    | 166 +++++++++++++++++++++++
 test/t/memory/test_item.cpp                      |  16 ++-
 test/t/osm/test_location.cpp                     |  20 +--
 test/t/thread/test_pool.cpp                      |   4 +-
 test/t/util/.gitattributes                       |   1 +
 test/t/util/known_file_size                      |   1 +
 test/t/util/test_file.cpp                        |  92 +++++--------
 test/t/util/test_memory_mapping.cpp              |  20 ++-
 32 files changed, 620 insertions(+), 194 deletions(-)

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