[osmcoastline] 02/07: Merge tag 'upstream/2.1.3'

[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 ba2ded499e79826b1804dec29ef155c698b7ad8d
Merge: cc30352 6ce404e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 31 07:42:47 2016 +0200

    Merge tag 'upstream/2.1.3'
    
    Upstream version 2.1.3

 CHANGELOG.md                | 21 ++++++++++++++++++-
 CMakeLists.txt              |  2 +-
 include/gdalcpp.hpp         |  4 ++++
 src/osmcoastline.cpp        | 40 +++++++----------------------------
 src/osmcoastline_filter.cpp | 49 +++++++++++++++++++++++++++++++++++++------
 src/osmcoastline_ways.cpp   |  4 +++-
 src/output_database.cpp     | 24 ++++++++++-----------
 src/verbose_output.hpp      | 51 ---------------------------------------------
 8 files changed, 90 insertions(+), 105 deletions(-)

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