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

The following commit has been merged in the master branch:
commit 6fe3a6973dcd72ea4c3d020e1b9e87fae0e600c9
Merge: 37c8b26f30bec5efd870bfd8018eb29ef7c829de 99de0bb2008589a7a9f7b79e7e2595fcba9a2aac
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Oct 26 02:14:24 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

 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-text-ui packaging