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

[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 58c1c79bb3bfb08dbb6ec9dc3db97b4c91992ed1
Merge: d066860 3f7bf1e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 1 19:48:05 2015 +0200

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

 doc/options.txt                                    | 28 +++++++++----------
 doc/styles/internal-tags.txt                       | 24 ++++++++--------
 doc/styles/rules-filters.txt                       | 14 +++++-----
 doc/styles/rules.txt                               | 14 +++++-----
 doc/tutorial/publish.txt                           | 32 +++++++++++-----------
 resources/help/en/options                          | 22 +++++++--------
 resources/mkgmap-version.properties                |  4 +--
 resources/styles/default/inc/address               |  2 ++
 scripts/download/pre-commit-crlf                   |  2 +-
 src/uk/me/parabola/mkgmap/main/MapMaker.java       |  4 +--
 .../mkgmap/reader/osm/RestrictionRelation.java     | 32 ++++++++++++++--------
 .../mkgmap/reader/polish/PolishMapDataSource.java  | 24 ++++++++--------
 12 files changed, 107 insertions(+), 95 deletions(-)

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