[SCM] kwin packaging branch, kubuntu_unstable, updated. debian/5.4.2-1-133-gc34f4f6

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwin.git;a=commitdiff;h=c34f4f6

The following commit has been merged in the kubuntu_unstable branch:
commit c34f4f63be5fcedc8b2cfaf4f9e896b29ee4f512
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jan 12 11:49:12 2016 -0800

    Fix several merge markers, another batch patch symbols.
---
 debian/changelog | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31f79b8..b90d7dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kwin (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
   * Debian Merge: Remaining changes:
     Changes for new release.
     Build libkwinglutils7 on any architecture, unbreaks build on armhf
+  * Fix several merge markers, another batch patch symbols.
 
   [ Clive Johnston ]
   * new upstream release
@@ -15,15 +16,6 @@ kwin (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
   [ Bhushan Shah ]
   * Build libkwinglutils7 on any architecture, unbreaks build on armhf
 
-  [ Scarlett Clark ]
-  * Fix duplicate breaks/replace. 
-  * Fix merge duplications. 
-  * Remove another duplicate cruft from bad merge. 
-  * Remove merge cruft from the dbg package... 
-  * Remove merge markers. 
-  * Remove merge markers from changelog. 
-  * batchpatch amd64,i386 symbols. 
-
  -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:46:44 +0000
 
 kwin (4:5.4.3-0ubuntu4) xenial; urgency=medium

-- 
kwin packaging