[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=ee38462

The following commit has been merged in the master branch:
commit ee38462d4b5e5a73c7de7d4f7b35e3cf141b3735
Merge: e8dfd2d567c45258cbb4b916d509842042720cfe d236934332bb260b2d09bc1a1861e0ad1348629e
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Jun 17 16:30:47 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    Conflicts:
    	logviewer/ktp-log-viewer.desktop

 config/kcm_ktp_chat_appearance.desktop             | 5 +++--
 config/kcm_ktp_chat_behavior.desktop               | 1 +
 lib/CMakeLists.txt                                 | 1 -
 lib/logmanager.cpp                                 | 5 -----
 logviewer/ktp-log-viewer.desktop                   | 7 +++----
 logviewer/log-viewer.cpp                           | 5 -----
 plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop | 4 ++--
 7 files changed, 9 insertions(+), 19 deletions(-)

-- 
ktp-text-ui packaging