This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmcoastline.
commit 968b6a3ceb6bca0e952ad2422780aff60585921f
Merge: 9c0f321 a3160fa
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Aug 18 16:13:20 2015 +0200
Merge tag 'upstream/2.1.0'
Upstream version 2.1.0
CHANGELOG.md | 22 +++-
CMakeLists.txt | 12 ++-
README.md | 2 +-
cmake/FindOSMPBF.cmake | 50 ---------
cmake/FindOsmium.cmake | 10 +-
man/manpage.template | 3 +-
man/osmcoastline.md | 29 ++++-
man/osmcoastline_segments.md | 69 ++++++++++++
simplify_and_split/split_tiles.sql | 3 +-
src/CMakeLists.txt | 4 +
src/coastline_ring_collection.cpp | 10 +-
src/coastline_ring_collection.hpp | 2 +-
src/options.cpp | 8 +-
src/options.hpp | 3 +
src/osmcoastline.cpp | 19 +++-
src/osmcoastline_filter.cpp | 2 -
src/osmcoastline_segments.cpp | 214 +++++++++++++++++++++++++++++++++++++
src/osmcoastline_ways.cpp | 2 -
18 files changed, 384 insertions(+), 80 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmcoastline.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
