[SCM] kcodecs packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-7-g29768bc

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcodecs.git;a=commitdiff;h=2d68b31

The following commit has been merged in the kubuntu_wily_archive branch:
commit 2d68b318097532f8fc6be883ba4d33d4503ef215
Merge: 8425c5d5093bbf26343b710882ca04f67ead907b 3a444189f0a57ed3f850d6179f4864d0a3df5d54
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:31:09 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 2d66688,680e263..85f106a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
+ kcodecs (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:07:14 -0700
+ 
 +kcodecs (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 18:27:44 +0200
 +
  kcodecs (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kcodecs packaging