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

[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 33b0203bfa4e6e07ae2f154e37c5882c5e80a294
Merge: 5307ee5 f67a403
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 2 00:37:59 2016 +0200

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

 .idea/ant.xml                                      |  3 +-
 .idea/modules.xml                                  |  3 +-
 build.xml                                          |  2 +-
 resources/mkgmap-version.properties                |  4 +-
 resources/styles/default/inc/water_lines           |  3 +
 src/uk/me/parabola/imgfmt/app/mdr/MDRFile.java     |  3 -
 src/uk/me/parabola/imgfmt/app/mdr/Mdr1.java        | 31 ---------
 src/uk/me/parabola/imgfmt/app/mdr/Mdr10.java       |  9 ---
 src/uk/me/parabola/imgfmt/app/mdr/Mdr11.java       |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr2x.java       |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java        |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr6.java        |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java        |  4 --
 .../me/parabola/imgfmt/app/mdr/MdrMapSection.java  | 23 ------
 .../me/parabola/mkgmap/combiners/MdrBuilder.java   |  7 +-
 src/uk/me/parabola/mkgmap/main/Main.java           | 81 +++++++++++++++-------
 .../parabola/mkgmap/osmstyle/RuleFileReader.java   |  9 ++-
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 12 ++--
 .../mkgmap/sea/optional/PrecompSeaGenerator.java   | 35 ++++------
 .../mkgmap/osmstyle/RuleFileReaderTest.java        | 21 ++++++
 20 files changed, 115 insertions(+), 151 deletions(-)

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