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

The following commit has been merged in the master branch:
commit bf370b5e66e7c0e1f76c49703053171001b60009
Merge: b3d3f27d5000d05a1e179f8f162f2afba2c76a3d 02f5c46161ab558ef7a13eb153db998109224009
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed May 15 22:29:46 2013 +0100

    Merge branch 'kde-telepathy-0.6'
    
    Conflicts:
    	filters/highlight/ktptextui_message_filter_highlight.desktop.cmake

 lib/chat-widget.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-- 
ktp-text-ui packaging