[mkgmap] 03/07: Merge tag 'upstream/0.0.0+svn3383'

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository mkgmap.

commit 2131b074065e791cb1ff65ad57452a1ce880f75d
Merge: 4ba71a7 82a85d8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 19 12:06:36 2014 +0100

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

 doc/mkgmap.1                                       |   4 +-
 doc/tutorial/Makefile                              |  12 +-
 doc/tutorial/custom.txt                            |  12 ++
 doc/tutorial/first_map.txt                         |  34 +++++
 doc/tutorial/{tutorial.txt => main.txt}            |  16 +--
 doc/tutorial/publish.txt                           |  39 ++++++
 doc/tutorial/second_map.txt                        |  40 ++++++
 doc/tutorial/splitter.txt                          |  23 ++++
 doc/tutorial/starting.txt                          |  21 ++-
 resources/mkgmap-version.properties                |   4 +-
 .../me/parabola/imgfmt/app/net/NETFileReader.java  |   2 +-
 src/uk/me/parabola/imgfmt/app/net/NETHeader.java   |   4 +
 .../mkgmap/osmstyle/actions/PartFilter.java        |   6 +-
 .../mkgmap/osmstyle/actions/SubstringFilter.java   |  16 ++-
 .../mkgmap/osmstyle/actions/PartFilterTest.java    | 148 +++++++++++++++++++++
 .../osmstyle/actions/SubstringFilterTest.java      |  69 ++++++++++
 16 files changed, 419 insertions(+), 31 deletions(-)

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