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

The following commit has been merged in the master branch:
commit 7f47cdd8ed750dbed24809871979100ff568061e
Merge: 2a64e8fafdacbf3ffbc6b01fad6c6e880a3029ff d36977b14f18b888737ba64e67c1e52572106539
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Sun Aug 24 01:16:07 2014 +0200

    Merge branch 'otr-proxy' of git://anongit.kde.org/ktp-text-ui into otr-proxy

 app/CMakeLists.txt                                 |   1 +
 app/chat-window.cpp                                | 180 ++++++++-
 app/chat-window.h                                  |  15 +
 app/chatwindow.rc                                  |   5 +-
 app/main.cpp                                       |   8 +-
 cmake/modules/FindKTp.cmake                        |   2 +
 config/CMakeLists.txt                              |  18 +-
 config/kcm_ktp_chat_otr.desktop                    | 122 ++++++
 config/otr-config.cpp                              | 285 +++++++++++++
 config/{behavior-config.h => otr-config.h}         |  71 ++--
 config/otr-config.ui                               | 439 ++++++++++++++++++++
 lib/CMakeLists.txt                                 |   6 +
 lib/authenticationwizard.cpp                       | 445 +++++++++++++++++++++
 lib/authenticationwizard.h                         | 106 +++++
 lib/chat-widget.cpp                                | 392 ++++++++++++++----
 lib/chat-widget.h                                  |  34 ++
 lib/keygendialog.ui                                |  60 +++
 lib/otr-notifications.cpp                          | 123 ++++++
 .../appearance-config.h => lib/otr-notifications.h |  38 +-
 lib/otr-status.cpp                                 |  52 +++
 lib/otr-status.h                                   |  49 +++
 lib/proxy-service.cpp                              | 239 +++++++++++
 lib/proxy-service.h                                |  75 ++++
 logviewer/entity-view.h => lib/types.h             |  35 +-
 24 files changed, 2644 insertions(+), 156 deletions(-)

-- 
ktp-text-ui packaging