[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=5b626e8

The following commit has been merged in the master branch:
commit 5b626e8b278b4d698bc95883920e7a4438fd7c60
Merge: a46eb6bbeaac41556f3a6af88683acb2f478cd73 398ba70fecfd6a7ef1b81c74375050ebc161044b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 14 19:59:14 2013 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	CMakeLists.txt
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	logviewer/ktp-log-viewer.desktop
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
ktp-text-ui packaging