[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f0fad72

The following commit has been merged in the master branch:
commit f0fad7254889f05bf72eb83fc38d3bb9e670109d
Merge: 43ace4fd8906b8aa8d45ca385a90c21504186267 3b687836dd353d3d2fd4da70c38264e5754c9d04
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Aug 31 16:25:57 2012 +0200

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_messages.desktop
    	filters/emoticons/ktptextui_message_filter_emoticons.desktop
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/images/ktptextui_message_filter_images.desktop
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop

 config/kcm_ktp_chat_appearance.desktop             |  8 +--
 config/kcm_ktp_chat_behavior.desktop               |  2 -
 lib/CMakeLists.txt                                 |  2 +
 lib/ktptxtui_message_filter.desktop                | 16 ------
 lib/logmanager.cpp                                 | 12 +++--
 lib/url-filter.cpp                                 | 59 +++++-----------------
 logviewer/ktp-log-viewer.desktop                   |  8 +--
 plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop |  4 --
 8 files changed, 24 insertions(+), 87 deletions(-)

-- 
ktp-text-ui packaging