[SCM] kimageformats packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-7-ge63ce12

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit ca712291fb196205d7f7674b02731bdaf080fc4d
Merge: 5b52528ad3d773a04b61cb2f75e82253a654bd5b 2d69ca8fcafb2fa5f747745226a5314c78f804c4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 11:24:45 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 6dab4fa,82524a4..fa92dc9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kimageformats (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:21:22 -0700
+ 
 +kimageformats (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 15:52:45 +0200
 +
  kimageformats (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kimageformats packaging