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

[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 777cfe2993945aa716ef57ed4f8cd7592b9d30e6
Merge: 735eb84 00d9566
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 1 12:00:36 2015 +0200

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

 mkgmap.iml                                         | 38 ++++++++++++++--------
 resources/mkgmap-version.properties                |  4 +--
 src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java        |  3 ++
 src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java |  2 +-
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  4 ++-
 5 files changed, 33 insertions(+), 18 deletions(-)

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