[osmcoastline] 02/06: Merge tag 'upstream/2.1.2'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmcoastline.

commit 763fd6dce2a9c55003d45100884abe8c0db500cd
Merge: 0bfe4bc 373bcb5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 7 07:40:04 2016 +0100

    Merge tag 'upstream/2.1.2'
    
    Upstream version 2.1.2

 .ycm_extra_conf.py                         |   2 +-
 CHANGELOG.md                               |  23 +-
 CMakeLists.txt                             |   8 +-
 README.md                                  |  15 +-
 cmake/FindOsmium.cmake                     |  13 +-
 include/gdalcpp.hpp                        | 406 +++++++++++++++++++++++++++++
 man/manpage.template                       |   2 +-
 man/osmcoastline.md                        |   3 +
 man/osmcoastline_filter.md                 |   3 +
 man/osmcoastline_readmeta.md               |   9 +
 man/osmcoastline_segments.md               |   3 +
 man/osmcoastline_ways.md                   |   9 +
 osmcoastline_readmeta                      |  16 ++
 src/CMakeLists.txt                         |   4 +-
 src/coastline_handlers.hpp                 |   2 +-
 src/coastline_polygons.cpp                 |  99 ++++---
 src/coastline_polygons.hpp                 |  15 +-
 src/coastline_ring.cpp                     |  14 +-
 src/coastline_ring.hpp                     |   2 +-
 src/coastline_ring_collection.cpp          |  27 +-
 src/coastline_ring_collection.hpp          |   4 +-
 src/ogr_include.hpp                        |  42 ---
 src/options.cpp                            |  15 +-
 src/options.hpp                            |   2 +-
 src/osmcoastline.cpp                       |  24 +-
 src/osmcoastline_filter.cpp                |  70 +++--
 src/osmcoastline_segments.cpp              |  76 ++----
 src/osmcoastline_ways.cpp                  | 115 +++-----
 src/output_database.cpp                    | 236 ++++++++++-------
 src/output_database.hpp                    |  89 +++----
 src/output_layers.cpp                      | 321 -----------------------
 src/output_layers.hpp                      | 124 ---------
 src/{osmcoastline.hpp => return_codes.hpp} |   2 +-
 src/srs.cpp                                |   2 +-
 src/srs.hpp                                |   2 +-
 src/stats.hpp                              |   2 +-
 src/util.hpp                               |  41 +++
 37 files changed, 951 insertions(+), 891 deletions(-)

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