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

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mkgmap.

commit fdb04d22100362713e9b05fc50adaaf144140762
Merge: a2e5296 46c9c93
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 1 09:47:28 2016 +0200

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

 doc/options.txt                                          | 5 +++++
 resources/help/en/options                                | 5 +++++
 resources/mkgmap-version.properties                      | 4 ++--
 src/uk/me/parabola/imgfmt/FileSystemParam.java           | 9 +++++++++
 src/uk/me/parabola/imgfmt/sys/ImgHeader.java             | 9 +++++++--
 src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java | 4 ++++
 6 files changed, 32 insertions(+), 4 deletions(-)

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