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

The following commit has been merged in the master branch:
commit a7e4b674d72ae50e5102e27b0d1727ca6ff92c86
Merge: cc4cb3d636bf93a160f628338603ba7f71781b8a 8d6f4b7f91ea66086a46a81c6111dab825b7fb63
Author: Alexander Potashev <aspotashev at gmail.com>
Date:   Mon May 4 22:13:03 2015 +0300

    Merge branch 'Applications/15.04'

 config/CMakeLists.txt                              | 64 ++--------------------
 config/Messages.sh                                 |  8 ---
 config/appearance/CMakeLists.txt                   | 24 ++++++++
 config/appearance/Messages.sh                      |  4 ++
 config/{ => appearance}/appearance-config-tab.cpp  |  0
 config/{ => appearance}/appearance-config-tab.h    |  0
 config/{ => appearance}/appearance-config.cpp      |  0
 config/{ => appearance}/appearance-config.h        |  0
 config/{ => appearance}/appearance-config.ui       |  0
 .../kcm_ktp_chat_appearance.desktop                |  0
 config/behavior/CMakeLists.txt                     | 23 ++++++++
 config/behavior/Messages.sh                        |  4 ++
 config/{ => behavior}/behavior-config.cpp          |  0
 config/{ => behavior}/behavior-config.h            |  0
 config/{ => behavior}/behavior-config.ui           |  0
 .../{ => behavior}/kcm_ktp_chat_behavior.desktop   |  0
 config/messages/CMakeLists.txt                     | 20 +++++++
 config/messages/Messages.sh                        |  2 +
 .../{ => messages}/kcm_ktp_chat_messages.desktop   |  0
 config/{ => messages}/messages-config.cpp          |  0
 config/{ => messages}/messages-config.h            |  0
 config/otr/CMakeLists.txt                          | 24 ++++++++
 config/otr/Messages.sh                             |  4 ++
 config/{ => otr}/kcm_ktp_chat_otr.desktop          |  0
 config/{ => otr}/otr-config.cpp                    |  0
 config/{ => otr}/otr-config.h                      |  0
 config/{ => otr}/otr-config.ui                     |  0
 filters/latex/CMakeLists.txt                       |  2 +-
 lib/CMakeLists.txt                                 |  2 +-
 logviewer/CMakeLists.txt                           |  2 +-
 logviewer/config/CMakeLists.txt                    |  2 +-
 31 files changed, 113 insertions(+), 72 deletions(-)

-- 
ktp-text-ui packaging