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

The following commit has been merged in the master branch:
commit a560fbcf178444b0b4f1da9c34e49fccc4e24046
Merge: b97b8c43da97e70eabc27ccfc8f243a1a374e8ed 58a11b15218783af860b568274df4e5be134b6a0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Nov 25 11:47:46 2013 +0100

    Merge branch 'kpeople2'

 CMakeLists.txt                                   |   1 +
 KTp/CMakeLists.txt                               |   1 +
 KTp/Models/CMakeLists.txt                        |   2 +-
 KTp/Models/contacts-model.cpp                    |  14 --
 KTp/Models/kpeopletranslationproxy.cpp           | 187 ++++++++++++---------
 KTp/Models/kpeopletranslationproxy.h             |   7 +-
 KTp/core.cpp                                     |  28 ++--
 KTp/core.h                                       |   4 +
 KTp/global-contact-manager.cpp                   |  32 ++++
 KTp/global-contact-manager.h                     |   3 +
 KTp/im-persons-data-source.cpp                   | 200 +++++++++++------------
 KTp/im-persons-data-source.h                     |  22 +--
 KTp/types.h                                      |   2 +-
 kpeople/CMakeLists.txt                           |   2 +-
 kpeople/actionsplugin/CMakeLists.txt             |   1 +
 kpeople/actionsplugin/kpeople-actions-plugin.cpp |  52 +++---
 kpeople/actionsplugin/kpeople-actions-plugin.h   |   4 +-
 kpeople/datasourceplugin/CMakeLists.txt          |   1 -
 kpeople/uiplugins/CMakeLists.txt                 |   1 +
 kpeople/uiplugins/imdetailswidget.cpp            |  81 +++++----
 kpeople/uiplugins/imdetailswidget.h              |  12 +-
 21 files changed, 349 insertions(+), 308 deletions(-)

-- 
ktp-common-internals packaging