[SCM] kpimtextedit packaging branch, kubuntu_unstable, updated. debian/15.08.1-1-31-gf1be31b

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kpimtextedit.git;a=commitdiff;h=f1be31b

The following commit has been merged in the kubuntu_unstable branch:
commit f1be31b8980792b39a318185574c8a6cf8f5be66
Merge: 8bba7ac31245252227021ffe6f8e80667031bc45 e2fef0b2fb90b4bf8a7d2b30be1e7067c19d6c5f
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Feb 2 10:02:29 2016 -0800

    Refresh symbols.

 debian/changelog                  | 6 +++++-
 debian/libkf5pimtextedit5.symbols | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 295bf40,54787b0..a192270
--- a/debian/changelog
+++ b/debian/changelog
@@@ -6,11 -5,8 +6,15 @@@ kpimtextedit (15.12.1-0ubuntu1) UNRELEA
    * Add missing dependencies. 
    * Fix new depenency names. 
    * wrap-and-sort 
- 
+   * Refresh symbols. 
++  
 +  [ Clive Johnston ]
 +  * Updating symbols 
 +  * Adding new file to install 
 +
++  [ Scarlett Clark ]
++  * Fix merge.... 
+ 
   -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 01 Feb 2016 11:24:17 -0800
  
  kpimtextedit (15.12.0-1) experimental; urgency=medium

-- 
kpimtextedit packaging