[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=d2f50c4

The following commit has been merged in the master branch:
commit d2f50c43f38a6453b714ec38b56a0f2a7db00a9b
Merge: 6d9e3c5c868f8c0708bf8318e9473f4279671e4b 402178400be4d7548df9eeaab4cc48ea49e0e729
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Jan 14 09:09:45 2013 +0100

    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
    	lib/CMakeLists.txt
    	lib/escape-filter.cpp
    	lib/filters.h
    	lib/ktptxtui_message_filter.desktop
    	lib/message-processor.cpp
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

-- 
ktp-text-ui packaging