This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mkgmap.
commit eb2a81105b1e08c1616c085fb43d8fb57622c780 Merge: d30d796 e042a28 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Mar 3 23:01:08 2015 +0100 Merge tag 'upstream/0.0.0+svn3478' Upstream version 0.0.0+svn3478 resources/help/en/options | 10 ++ resources/mkgmap-version.properties | 4 +- resources/styles/default/inc/name | 8 + resources/styles/default/lines | 3 +- .../parabola/imgfmt/app/labelenc/Utf8Decoder.java | 1 - src/uk/me/parabola/imgfmt/app/mdr/Mdr20.java | 14 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr22.java | 2 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr2x.java | 41 +++-- src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java | 183 +++++++++++++++++++-- src/uk/me/parabola/imgfmt/app/mdr/Mdr7Record.java | 43 +++++ src/uk/me/parabola/imgfmt/app/mdr/MdrConfig.java | 9 + .../parabola/mkgmap/combiners/GmapsuppBuilder.java | 4 +- .../me/parabola/mkgmap/combiners/MdrBuilder.java | 4 +- .../parabola/mkgmap/osmstyle/RuleFileReader.java | 38 +++-- .../me/parabola/mkgmap/scan/SyntaxException.java | 2 +- test/resources/rules/multi-or-twice.test | 18 ++ test/resources/rules/multi-or-with-and.test | 19 +++ test/resources/rules/or-at-end.test | 30 ++++ .../mkgmap/osmstyle/RuleFileReaderTest.java | 1 + 19 files changed, 376 insertions(+), 58 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel