[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=6f8ea65

The following commit has been merged in the master branch:
commit 6f8ea65a17f2fd86513ee73f8029c03f1eca7b6f
Merge: 68ffd6e4ec2525287a3a00ddbabefcac0be3ce9f 3354ee75d89798316aba0b465c7470c86cf887c5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Apr 25 17:59:25 2014 +0200

    Merge branch 'origin-kde-telepathy-0.8'
    
    Conflicts:
    	filters/latex/kcm_ktptextui_message_filter_latex.desktop
    	filters/latex/ktptextui_message_filter_latex.desktop.cmake
    	lib/adium-theme-view.cpp

 CMakeLists.txt                                              |  2 +-
 config/kcm_ktp_chat_appearance.desktop                      |  2 --
 config/kcm_ktp_chat_behavior.desktop                        |  1 -
 config/kcm_ktp_chat_messages.desktop                        |  3 ---
 .../ktptextui_message_filter_bugzilla.desktop.cmake         |  1 -
 .../ktptextui_message_filter_emoticons.desktop.cmake        |  3 ---
 .../ktptextui_message_filter_formatting.desktop.cmake       |  2 --
 .../ktptextui_message_filter_highlight.desktop.cmake        |  5 ++---
 .../images/ktptextui_message_filter_images.desktop.cmake    |  2 --
 filters/latex/latex-filter.cpp                              |  3 ++-
 .../ktptextui_message_filter_searchexpansion.desktop.cmake  |  2 --
 .../texttospeech/ktptextui_message_filter_tts.desktop.cmake |  1 -
 .../ktptextui_message_filter_urlexpansion.desktop.cmake     | 13 +++++--------
 .../youtube/ktptextui_message_filter_youtube.desktop.cmake  |  1 -
 logviewer/config/kcm_ktp_logviewer_behavior.desktop         |  2 +-
 logviewer/dates-model.cpp                                   |  4 ++++
 logviewer/ktp-log-viewer.desktop                            |  4 ----
 17 files changed, 15 insertions(+), 36 deletions(-)

-- 
ktp-text-ui packaging