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

The following commit has been merged in the master branch:
commit f1dd47fb3a657ebe438e45c7beabb440c641d58e
Merge: 465da55c8cf323eee60dd4c01f8a2dbc51c9186a 2ff4fae6865b1798de471170b75fe0d2d0ff1e38
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Sep 21 02:24:38 2012 +0100

    Merge branch 'kde-telepathy-0.5' of git://anongit.kde.org/ktp-text-ui into kde-telepathy-0.5

 config/kcm_ktp_chat_messages.desktop                     | 10 ++++++++++
 .../emoticons/ktptextui_message_filter_emoticons.desktop | 11 +++++++++++
 .../ktptextui_message_filter_formatting.desktop          |  9 +++++++++
 filters/images/ktptextui_message_filter_images.desktop   | 12 +++++++++++-
 .../ktptextui_message_filter_searchexpansion.desktop     |  5 +++++
 lib/chat-widget.cpp                                      | 16 ++++++++--------
 lib/chat-widget.h                                        |  3 +--
 lib/ktptxtui_message_filter.desktop                      |  4 ++++
 logviewer/ktp-log-viewer.desktop                         |  4 ++--
 9 files changed, 61 insertions(+), 13 deletions(-)

-- 
ktp-text-ui packaging