[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=37c8b26

The following commit has been merged in the master branch:
commit 37c8b26f30bec5efd870bfd8018eb29ef7c829de
Merge: 376a50dea1dd21220cfcfd078efc04ae47c819e4 752dae9e50691d0cdc82cbb3f389849445f75092
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Oct 23 14:37:51 2013 +0200

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	filters/latex/kcm_ktptextui_message_filter_latex.desktop
    	filters/latex/ktptextui_message_filter_latex.desktop.cmake
    	filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
    	logviewer/config/kcm_ktp_logviewer_behavior.desktop

 logviewer/dates-model.cpp | 460 ++++++++++++++++++++++++++--------------------
 logviewer/dates-model.h   |  14 +-
 2 files changed, 263 insertions(+), 211 deletions(-)

-- 
ktp-text-ui packaging