[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3701-1' into jessie-backports

[Bas Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository mkgmap.

commit 4d43a5a0b85cfc559fd505600ac42e13a73f46ef
Merge: 631bb78 e7f4cd8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 8 07:29:58 2016 +0100

    Merge tag 'debian/0.0.0+svn3701-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 .idea/codeStyleSettings.xml                        |   1 -
 .idea/encodings.xml                                |   4 +-
 .idea/inspectionProfiles/Mapping.xml               | 285 ++++++++++++++++++++-
 .idea/inspectionProfiles/Project_Default.xml       |   3 +-
 .idea/misc.xml                                     |   6 +-
 debian/changelog                                   |   6 +
 doc/styles/creating.txt                            |   2 +-
 doc/styles/files.txt                               |   2 +-
 doc/styles/rules-filters.txt                       |   5 +-
 doc/styles/rules.txt                               |  10 +-
 doc/typ-compiler.txt                               |   2 +-
 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/landuse_polygons      |   2 +-
 scripts/download/mkdoc                             |   6 +-
 .../mkgmap/osmstyle/eval/UnitConversions.java      |  10 +
 .../parabola/mkgmap/reader/test/AllElements.java   |  91 +++++--
 16 files changed, 392 insertions(+), 47 deletions(-)

diff --cc debian/changelog
index b2d1ef1,759854a..8675c6f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mkgmap (0.0.0+svn3701-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 02 Nov 2016 19:32:57 +0100
+ 
 +mkgmap (0.0.0+svn3695-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 07 Oct 2016 09:48:44 +0200
 +
  mkgmap (0.0.0+svn3695-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.

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