[SCM] kplotting packaging branch, master, updated. debian/5.37.0-2-77-g14f4dcf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7992215a64813ff10141e448be9eb806891cbbac
Merge: ce231e0a893cebfe101160670f810bcb5a7e76d7 0cc78ee209b2e69e95bad2043eb3c63329df62df
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:52:10 2015 +0200

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

 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index dd1b064,d22c640..7f49dba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kplotting (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 14:25:48 +0200
+ 
 +kplotting (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:04:20 +0200
 +
  kplotting (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kplotting packaging