[SCM] ksnakeduel packaging branch, master, updated. debian/4.14.0-1-13-gd915a2f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ksnakeduel.git;a=commitdiff;h=a123b0a

The following commit has been merged in the master branch:
commit a123b0ac915c2f0a11b8f4ec11a7840e1a88978e
Merge: a3bd59210c9a8ec400f15e95c867b485a44ad90a e617553bd0550c52738a398195d5c69287781b32
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 13:38:45 2015 +0100

    Merge commit 'e617553bd0550c52738a398195d5c69287781b32'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index d69f9c4,25d33b6..6a7478e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +ksnakeduel (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:50:42 +0100
 +
+ ksnakeduel (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Release to archive.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 15:09:08 -0700
+ 
  ksnakeduel (4:14.12.0-0ubuntu1) vivid; urgency=medium
  
    [ Scarlett Clark ]
@@@ -67,7 -68,7 +74,7 @@@ ksnakeduel (4:4.13.2-0ubuntu4) utopic; 
  
  ksnakeduel (4:4.13.2-0ubuntu3) utopic; urgency=medium
  
--  * Add a transitional package for ksnakeduel 
++  * Add a transitional package for ksnakeduel
    * ktron breaks/replaces ksnakeduel << 4:4.13.2
  
   -- Philip Muškovac <yofel at kubuntu.org>  Sun, 06 Jul 2014 22:25:11 +0200
@@@ -333,4 -334,4 +340,3 @@@ ksnakeduel (4:4.9.90-0ubuntu1) raring; 
    * Initial release
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Dec 2012 17:39:47 +0000
--

-- 
ksnakeduel packaging