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

[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 861dc2aba6cc6cb51a0e4c0af84157b9133a317f
Merge: cd59c11 f268957
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed May 4 08:44:25 2016 +0200

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

 doc/options.txt                                    |  5 +--
 doc/styles/internal-tags.txt                       |  2 +-
 resources/help/en/options                          |  6 ++--
 resources/mkgmap-version.properties                |  4 +--
 resources/styles/default/lines                     | 18 +++++-----
 src/uk/me/parabola/mkgmap/main/StyleTester.java    | 16 +++++++++
 src/uk/me/parabola/mkgmap/osmstyle/ActionRule.java |  5 +++
 .../parabola/mkgmap/osmstyle/ExpressionRule.java   |  5 +++
 src/uk/me/parabola/mkgmap/osmstyle/RuleSet.java    | 19 +++++++++++
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  6 +++-
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 38 ++++++++++++++--------
 src/uk/me/parabola/mkgmap/reader/osm/Rule.java     |  2 ++
 12 files changed, 93 insertions(+), 33 deletions(-)

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