[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b9d8442

The following commit has been merged in the master branch:
commit b9d8442f535a85ebd1fc4aad9f75e4e4d25b7ad4
Merge: 288e534e19bb243d579d946a6555ab4053a92e99 86c8781af19aeade816e409a7ebab0fdd300b721
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Jan 7 23:32:22 2013 +0100

    Merge branch 'move_plasma_2_declarative' of ../ktp-text-ui-declarative into move_plasma_2

 KTp/Declarative/channel-delegator.h                |  42 +++
 KTp/Declarative/conversation-que-manager.cpp       | 102 +++++++
 KTp/Declarative/conversation-que-manager.h         |  64 +++++
 KTp/Declarative/conversation-target.cpp            | 131 +++++++++
 KTp/Declarative/conversation-target.h              |  74 +++++
 KTp/Declarative/conversation.cpp                   | 105 +++++++
 KTp/Declarative/conversation.h                     |  72 +++++
 KTp/Declarative/conversations-model.cpp            | 163 +++++++++++
 KTp/Declarative/conversations-model.h              |  63 +++++
 .../hide-window-component.cpp}                     |  24 +-
 .../hide-window-component.h}                       |  30 +-
 KTp/Declarative/messages-model.cpp                 | 311 +++++++++++++++++++++
 KTp/Declarative/messages-model.h                   |  91 ++++++
 KTp/Declarative/telepathy-text-observer.cpp        |  78 ++++++
 .../telepathy-text-observer.h}                     |  39 +--
 15 files changed, 1342 insertions(+), 47 deletions(-)

-- 
ktp-common-internals packaging