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

[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 7aaa52e9629e151eca42dd843a0aaafb1b0de58a
Merge: 488b05f 7fc8d85
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 31 23:07:20 2015 +0200

    Merge tag 'upstream/2.0.1'
    
    Upstream version 2.0.1

 .ycm_extra_conf.py                                 |   6 +-
 CHANGELOG.md                                       |  18 ++++
 CMakeLists.txt                                     |  77 +++++++++++++--
 README.md                                          |  14 ++-
 fix-formatting.sh                                  |   7 ++
 man/manpage.template                               |  28 ++++++
 man/osmcoastline.md                                | 110 +++++++++++++++++++++
 man/osmcoastline_filter.md                         |  55 +++++++++++
 man/osmcoastline_readmeta.md                       |  28 ++++++
 man/osmcoastline_ways.md                           |  34 +++++++
 osmcoastline_readmeta                              |  87 ++++++++++++++++
 osmcoastline_readmeta.sh                           |  85 ----------------
 runtest.sh.in                                      |   2 +-
 src/CMakeLists.txt                                 |  20 ++++
 .../coastline_handlers.hpp                         |   9 +-
 .../coastline_polygons.cpp                         |   2 +-
 .../coastline_polygons.hpp                         |   4 +-
 coastline_ring.cpp => src/coastline_ring.cpp       |   0
 coastline_ring.hpp => src/coastline_ring.hpp       |  41 +++++---
 .../coastline_ring_collection.cpp                  |   0
 .../coastline_ring_collection.hpp                  |  26 +++--
 ogr_include.hpp => src/ogr_include.hpp             |   0
 options.cpp => src/options.cpp                     |  39 ++++----
 options.hpp => src/options.hpp                     |   0
 osmcoastline.cpp => src/osmcoastline.cpp           |   2 +-
 osmcoastline.hpp => src/osmcoastline.hpp           |   0
 .../osmcoastline_filter.cpp                        |   0
 osmcoastline_ways.cpp => src/osmcoastline_ways.cpp |  20 ++--
 output_database.cpp => src/output_database.cpp     |   3 +-
 output_database.hpp => src/output_database.hpp     |   0
 output_layers.cpp => src/output_layers.cpp         |  15 +--
 output_layers.hpp => src/output_layers.hpp         |   0
 srs.cpp => src/srs.cpp                             |   0
 srs.hpp => src/srs.hpp                             |  20 +++-
 stats.hpp => src/stats.hpp                         |   0
 verbose_output.hpp => src/verbose_output.hpp       |   3 +
 taginfo.json                                       |   2 +-
 37 files changed, 589 insertions(+), 168 deletions(-)

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