[mkgmap] 02/04: Merge tag 'upstream/0.0.0+svn3598'

[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 f49b096fc9c62eb11752a1447eabb40c8e33cc60
Merge: 0ac5cc2 21243da
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jun 1 08:57:20 2015 +0200

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

 doc/options.txt                                    | 45 ++++++++-------
 resources/help/en/options                          | 52 ++++++++---------
 resources/mkgmap-version.properties                |  4 +-
 resources/styles/default/lines                     |  2 +-
 resources/styles/default/points                    |  2 +-
 src/uk/me/parabola/mkgmap/build/LocatorConfig.java | 15 +++--
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    | 57 ++++++++++++++-----
 src/uk/me/parabola/mkgmap/main/Main.java           |  4 +-
 .../parabola/mkgmap/osmstyle/StyledConverter.java  | 66 +++++++++++++++++++---
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 56 ++++++++++--------
 .../mkgmap/reader/osm/POIGeneratorHook.java        | 48 +++++++++++++++-
 11 files changed, 241 insertions(+), 110 deletions(-)

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