[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=0f4221c

The following commit has been merged in the master branch:
commit 0f4221c072c864b57e3477a726b26bdb7240ef23
Merge: c07a66726e7b378e6f42ac788678ab7ea57650a4 e61dee0ab0086547d6f1b9d256232326bb169bc4
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 17 21:37:30 2014 +0100

    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

 CMakeLists.txt            | 2 +-
 logviewer/entity-view.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
ktp-text-ui packaging