[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=617b40e

The following commit has been merged in the master branch:
commit 617b40eee8d17d322ec90ae2a900438d19be492d
Merge: 911edd5374a22851b09ba4a7a7261d5e344d696f 8a2a35921595429c9c3a17a29835c7c20e4f750c
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Mon Apr 1 17:09:18 2013 +0200

    Merge branch 'kde-telepathy-0.6'
    
    Conflicts:
    	filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
    	filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
    	filters/highlight/ktptextui_message_filter_highlight.desktop.cmake
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
    	filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake
    	filters/youtube/ktptextui_message_filter_youtube.desktop.cmake

 lib/text-chat-config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-text-ui packaging