[libosmium] 05/07: Merge tag 'upstream/2.11.3'

[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 581052fa6b1370d3eceb76cefd7ebbbc4cd5c39b
Merge: 9870db0 71a1169
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed May 3 18:39:36 2017 +0200

    Merge tag 'upstream/2.11.3'
    
    Upstream version 2.11.3

 CHANGELOG.md                                  | 14 +++++++++++++-
 CMakeLists.txt                                |  2 +-
 include/osmium/area/assembler.hpp             | 24 +++++++++++++-----------
 include/osmium/io/detail/opl_input_format.hpp |  5 +++++
 include/osmium/version.hpp                    |  4 ++--
 test/CMakeLists.txt                           |  2 +-
 test/t/io/data-nonl.opl                       |  1 +
 test/t/io/data.opl                            |  1 +
 test/t/io/test_opl_parser.cpp                 | 22 ++++++++++++++++++++++
 9 files changed, 59 insertions(+), 16 deletions(-)

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