[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=2d91c14

The following commit has been merged in the master branch:
commit 2d91c14d6f6e71390de7704ea25f1b087f580225
Merge: 2c2406056a6e82b097d29321b82655c12a2b4e44 cb19e85b9d7ba7ce8b9e318b9fe65c4863f47011
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Mar 16 00:55:11 2012 +0000

    Merge remote-tracking branch 'contact-list/master'

 CMakeLists.txt                                     |  26 +++++
 declarative-plugin/CMakeLists.txt                  |  26 +++++
 declarative-plugin/contact-list.cpp                | 116 +++++++++++++++++++++
 declarative-plugin/contact-list.h                  |  56 ++++++++++
 declarative-plugin/qml-plugin.cpp                  |  33 ++++++
 declarative-plugin/qml-plugin.h                    |  31 ++++++
 declarative-plugin/qmldir                          |   1 +
 .../contents/frames/away.png                       | Bin
 .../contents/frames/busy.png                       | Bin
 .../contents/frames/offline.png                    | Bin
 .../contents/frames/online.png                     | Bin
 .../contents/ui/ContactDisplayName.qml             |  65 +++++-------
 .../contents/ui/ContactList.qml                    |  81 +++++++-------
 .../contents/ui/ExternalLabel.qml                  |  71 +++++--------
 .../contents/ui/ListContactDelegate.qml            | 110 ++++++++++---------
 .../contents/ui/main.qml                           |  37 +++----
 org.kde.ktp.contactlist/metadata.desktop           |  23 ++++
 17 files changed, 489 insertions(+), 187 deletions(-)

-- 
ktp-contact-applet packaging