[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=900ac72

The following commit has been merged in the master branch:
commit 900ac728113e3442635af7b4e617b29107916e82
Merge: a4a4b17e6bf3a459e2565fc548dba1e766908783 590d655721d4fa37acaffc2a6a9f9c5c9e358076
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Thu Sep 22 12:31:17 2011 +0300

    Merge branch 'desktop-sharing'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    FEATURE: 282202

 CMakeLists.txt                   |   4 +-
 contact-overlays.cpp             |  13 +++++
 contact-overlays.h               |  10 ++++
 main-widget.cpp                  |  52 +++++++++++++++++++
 main-widget.h                    |   2 +
 models/accounts-model.cpp        |   1 +
 models/accounts-model.h          |   1 +
 models/contact-model-item.cpp    |  26 ++++++++--
 models/contact-model-item.h      |   1 +
 service-availability-checker.cpp | 107 +++++++++++++++++++++++++++++++++++++++
 service-availability-checker.h   |  50 ++++++++++++++++++
 11 files changed, 263 insertions(+), 4 deletions(-)

-- 
ktp-contact-list packaging