[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=60fe7e3

The following commit has been merged in the master branch:
commit 60fe7e3a0c98a92988df6920b89bad44157a5503
Merge: 6ce2a1b8fd15396a09436bf4bd7f32c2743aa5ba b287d8ee3a06f894169956ef14692f6c368558ea
Author: Roman Nazarenko <me at jtalk.me>
Date:   Mon Apr 8 02:50:43 2013 +0600

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

 lib/chat-search-bar.cpp | 14 ++++++++++++++
 lib/chat-search-bar.h   |  3 +++
 lib/chat-widget.cpp     |  5 -----
 3 files changed, 17 insertions(+), 5 deletions(-)

-- 
ktp-text-ui packaging