[mkgmap] 02/05: Merge tag 'upstream/0.0.0+svn3668'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mkgmap.

commit f2dbb4b1ff79357b43289763561c51c35b7f7fbd
Merge: 3e852a1 35c6dd4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 1 06:36:12 2016 +0100

    Merge tag 'upstream/0.0.0+svn3668'
    
    Upstream version 0.0.0+svn3668

 doc/options.txt                                    | 19 ++++--
 resources/help/en/options                          | 22 +++---
 resources/mkgmap-version.properties                |  4 +-
 resources/styles/default/inc/access                | 22 +++---
 resources/styles/default/lines                     | 38 +++++------
 .../me/parabola/imgfmt/app/net/NumberPreparer.java | 79 +++++++++++-----------
 src/uk/me/parabola/imgfmt/app/net/RouteNode.java   |  1 -
 .../parabola/mkgmap/osmstyle/RuleFileReader.java   |  2 +
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  4 ++
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 59 +++++++++++-----
 .../parabola/mkgmap/reader/osm/SeaGenerator.java   | 15 ++--
 .../mkgmap/reader/osm/boundary/BoundaryMerger.java | 12 ++--
 .../mkgmap/reader/osm/boundary/BoundaryUtil.java   |  7 +-
 .../mkgmap/osmstyle/RuleFileReaderTest.java        | 45 ++++++++++++
 14 files changed, 207 insertions(+), 122 deletions(-)

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