[SCM] cantor packaging branch, master, updated. debian/4.14.1-1-8-g7d1545f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/cantor.git;a=commitdiff;h=1c7562f

The following commit has been merged in the master branch:
commit 1c7562fdc369d9ff5e230f7547909dec1981975e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Oct 21 19:49:19 2014 +0200

    Fix conflicts.
---
 debian/changelog | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fe74a7..290a374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 cantor (4:4.14.2-2~) UNRELEASED; urgency=medium
 
-  * 
+  [ Pino Toscano ]
+  * Update patches:
+    - octave_force_use_of_gnuplot: drop, applied upstream
 
- -- Maximiliano Curia <maxy at debian.org>  Tue, 21 Oct 2014 19:48:01 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Oct 2014 11:20:21 +0200
 
 cantor (4:4.14.2-1) unstable; urgency=medium
 
@@ -10,15 +12,6 @@ cantor (4:4.14.2-1) unstable; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 20 Oct 2014 17:13:24 +0200
 
-cantor (4:4.14.2-0r1) UNRELEASED; urgency=medium
-
-  [ Pino Toscano ]
-  * New upstream release.
-  * Update patches:
-    - octave_force_use_of_gnuplot: drop, applied upstream
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Oct 2014 11:20:21 +0200
-
 cantor (4:4.14.1-1) unstable; urgency=medium
 
   * Team upload.

-- 
cantor packaging