[SCM] kconfigwidgets packaging branch, master, updated. debian/5.37.0-2-96-gb5e51c0

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b6c9078eca960f294f46c10becf5e33e5004762a
Merge: ad349dadb4e72d67d25a36846b2e56375deb1fef 712f517c56722dc375591d0130ef446e69129078
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Jun 30 16:14:45 2015 +0200

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

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

diff --cc debian/changelog
index 7060794,afd4d52..702d002
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,18 @@@
- kconfigwidgets (5.10.0-0ubuntu1) wily; urgency=medium
+ kconfigwidgets (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 14:43:21 +0200
+ 
++kconfigwidgets (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:37:55 +0200
 +
  kconfigwidgets (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kconfigwidgets packaging