[osmcoastline] 02/04: Merge tag 'upstream/2.1.4'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmcoastline.

commit 1217678a782b71a0a7004a485aef869b6fef62f6
Merge: 64cce39 7db9ecb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 16 20:39:51 2016 +0200

    Merge tag 'upstream/2.1.4'
    
    Upstream version 2.1.4

 .travis.yml                       | 144 ++++++++++++++++++++++++++++++++++++++
 .ycm_extra_conf.py                |   5 ++
 CHANGELOG.md                      |  22 ++++--
 CMakeLists.txt                    |  27 +++++--
 README.md                         |   1 +
 src/CMakeLists.txt                |   6 +-
 src/coastline_handlers.hpp        |  17 ++---
 src/coastline_polygons.cpp        |  38 +++++-----
 src/coastline_polygons.hpp        |  15 ++--
 src/coastline_ring.cpp            |  17 +++--
 src/coastline_ring.hpp            |  20 ++++--
 src/coastline_ring_collection.cpp |  59 +++++++++-------
 src/coastline_ring_collection.hpp |  33 +++++----
 src/options.cpp                   |  36 +++++-----
 src/options.hpp                   |   2 +-
 src/osmcoastline.cpp              |  51 +++++++++-----
 src/osmcoastline_filter.cpp       |  40 ++++++-----
 src/osmcoastline_segments.cpp     |  46 +++++++-----
 src/osmcoastline_ways.cpp         |  55 +++++++++------
 src/output_database.cpp           |  28 ++++----
 src/output_database.hpp           |   7 +-
 src/srs.cpp                       |   1 +
 src/srs.hpp                       |   5 +-
 taginfo.json                      |   2 +-
 24 files changed, 466 insertions(+), 211 deletions(-)

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