[SCM] libkomparediff2 packaging branch, kubuntu_unstable, updated. debian/4.14.2-1-16-ga296feb

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a296febddca1f5e646a948651569b8d38534fc1e
Merge: f034132367dbd0cb285e3b8847dd8f450cfd469c 46dc61df0e3ecd29b62df21d572029381cf1178e
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Sat Mar 14 00:24:07 2015 +0000

    Merging remotes/origin/kubuntu_vivid_archive into kubuntu_unstable.

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

diff --cc debian/changelog
index aa7077d,6739051..e92fc75
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libkomparediff2 (4:14.12.50-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * KDE Frameworks 5 port
 +
 + -- Harald Sitter <sitter at kde.org>  Mon, 02 Mar 2015 11:27:34 +0100
 +
- libkomparediff2 (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
+ libkomparediff2 (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release.
  

-- 
libkomparediff2 packaging