[SCM] kxmlgui packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g4674713

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 4674713fd05dca9f744aad81275671d70444b270
Merge: 62eaaae79f488544b4a7cc92b2e82181510763d4 3a7cea68e121f7af468283ea39cfac2df0690e46
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 1 23:19:10 2015 +0200

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

 debian/changelog |  7 ++++++-
 debian/control   | 38 +++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 9435cd1,c0b25a7..f72efa4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,19 @@@
- kxmlgui (5.10.0-0ubuntu1) wily; urgency=medium
+ kxmlgui (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
    * Update symbols files from buildds logs (5.9.0-1).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 21:44:10 +0200
+ 
++kxmlgui (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:06:07 +0200
 +
  kxmlgui (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kxmlgui packaging