[SCM] kdesignerplugin packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g76b5993

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 76b59938342a26cbe96069a3be5debb08d3b1299
Merge: 70cde0c02ebee6041b5cf30aaab32f1d5226da1e 7554f258d21306ebd647cbcd810b9ecb336b0c0e
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:05:37 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog |  7 +++++++
 debian/control   | 30 +++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index edb1a6f,5460bd6..1c8248a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kdesignerplugin (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>  Mon, 29 Jun 2015 13:46:51 +0200
+ 
 +kdesignerplugin (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:00:02 +0200
 +
  kdesignerplugin (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kdesignerplugin packaging