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

[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 f951cc4d020030fc63eef32c2ed21d3970a0b05c
Merge: 10d10d5 8c966cd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 1 15:40:09 2015 +0200

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

 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/roadspeed             |   2 +-
 .../me/parabola/imgfmt/app/net/NumberPreparer.java |   5 -
 src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java |  15 +-
 src/uk/me/parabola/mkgmap/Options.java             |   6 +-
 .../me/parabola/mkgmap/osmstyle/ConvertedWay.java  |  54 ++--
 .../mkgmap/osmstyle/housenumber/ExtNumbers.java    |   8 +-
 .../osmstyle/housenumber/HousenumberElem.java      |   9 +
 .../osmstyle/housenumber/HousenumberGenerator.java | 314 +++++----------------
 .../osmstyle/housenumber/HousenumberIvl.java       | 106 ++++++-
 .../osmstyle/housenumber/HousenumberMatch.java     |   3 +-
 .../osmstyle/housenumber/HousenumberRoad.java      |  16 +-
 .../mkgmap/reader/osm/HousenumberHooks.java        |   1 -
 .../mkgmap/reader/osm/RestrictionRelation.java     |  28 +-
 test/func/ArgsTest.java                            |   2 +
 test/uk/me/parabola/mkgmap/CommandArgsTest.java    |   8 +-
 16 files changed, 251 insertions(+), 330 deletions(-)

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