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

[Sebastiaan Couwenberg]

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

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

commit 6c2d090c01b0bc4d54ed8de1e39f91320d4fc46c
Merge: 5189275 d554bc7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 10 18:27:41 2016 +0100

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

 debian/changelog                                    |  6 ++++++
 resources/splitter-version.properties               |  4 ++--
 src/uk/me/parabola/splitter/DensityMap.java         | 21 +++++++++++++--------
 .../me/parabola/splitter/DensityMapCollector.java   |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 37b838f,2b2d65b..c2c57f9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mkgmap-splitter (0.0.0+svn429-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Mar 2016 01:23:53 +0100
+ 
 +mkgmap-splitter (0.0.0+svn428-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 04 Mar 2016 23:48:20 +0100
 +
  mkgmap-splitter (0.0.0+svn428-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-splitter.git