[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=87091fc

The following commit has been merged in the master branch:
commit 87091fcb4800cc36cbcbff42bc2e8041f7eaafda
Merge: d0c550946527ed1ef727674d423fba35c9a97a5f 3ca24fbeabfdc6827f8fbe7a5bd05af561236807
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Nov 10 12:07:28 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_appearance.desktop
    	config/kcm_ktp_chat_behavior.desktop
    	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
    	lib/ktptxtui_message_filter.desktop
    	logviewer/ktp-log-viewer.desktop
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

 logviewer/message-view.cpp | 46 +++++++++++++---------------------------------
 logviewer/message-view.h   | 10 +++-------
 2 files changed, 16 insertions(+), 40 deletions(-)

-- 
ktp-text-ui packaging