[libosmium] 02/07: Merge tag 'upstream/2.4.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 22b0df85a2c6260b58ba270fd3edb896b824901c
Merge: 0f5ff70 93fff14
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 29 12:04:58 2015 +0200

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0

 CHANGELOG.md                                     |  34 ++-
 CMakeLists.txt                                   |  28 +-
 appveyor.yml                                     |  31 +--
 cmake/FindOsmium.cmake                           |  69 ++---
 examples/CMakeLists.txt                          |  26 +-
 examples/osmium_toogr.cpp                        | 244 -----------------
 examples/osmium_toogr2.cpp                       | 331 -----------------------
 examples/osmium_toogr2_exp.cpp                   | 305 ---------------------
 include/gdalcpp.hpp                              | 302 +++++++++++++++++++++
 include/osmium/area/problem_reporter_ogr.hpp     | 130 ++-------
 include/osmium/builder/osm_object_builder.hpp    |  67 ++---
 include/osmium/geom/factory.hpp                  |   1 +
 include/osmium/geom/ogr.hpp                      |  30 +-
 include/osmium/geom/tile.hpp                     |   4 +-
 include/osmium/io/detail/debug_output_format.hpp |   4 +-
 include/osmium/io/detail/input_format.hpp        |  11 +-
 include/osmium/io/detail/output_format.hpp       |   4 +-
 include/osmium/io/detail/pbf_decoder.hpp         |  29 +-
 include/osmium/io/detail/pbf_output_format.hpp   |  32 ++-
 include/osmium/io/detail/read_write.hpp          |   3 +
 include/osmium/io/detail/string_table.hpp        |  28 +-
 include/osmium/io/file.hpp                       |   3 +-
 include/osmium/io/reader.hpp                     |   6 +-
 include/osmium/io/writer.hpp                     |   2 +-
 include/osmium/osm/crc.hpp                       |  36 +--
 include/osmium/osm/types.hpp                     |   3 +
 include/osmium/util/delta.hpp                    |   8 +-
 include/osmium/util/memory_mapping.hpp           |   7 +
 include/protozero/varint.hpp                     |   4 -
 include/protozero/version.hpp                    |  22 ++
 scripts/travis_script.sh                         |   7 +
 test/data-tests/testdata-multipolygon.cpp        | 171 +++---------
 test/data-tests/testdata-overview.cpp            | 154 ++---------
 test/t/basic/test_crc.cpp                        |  21 ++
 test/t/basic/test_relation.cpp                   |  11 +
 test/t/tags/test_tag_list.cpp                    |  11 +
 36 files changed, 691 insertions(+), 1488 deletions(-)

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