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

The following commit has been merged in the master branch:
commit 7002659faa89fad1516ceb6e6f20420539d6cacb
Merge: fd34160fbdd7f2186e0eba58b0098d302b586e80 c9b1c3ef8a783e53ad1ebbc8556cda9df4f2cb94
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Dec 16 11:55:26 2013 +0100

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	filters/latex/kcm_ktptextui_message_filter_latex.desktop
    	filters/latex/ktptextui_message_filter_latex.desktop.cmake

 app/chat-window.cpp | 3 +++
 lib/chat-widget.cpp | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

-- 
ktp-text-ui packaging