[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=8a3efba

The following commit has been merged in the master branch:
commit 8a3efbaf5ded9da68b23d4228c21862612b01619
Merge: 9e2001540da5ec4a6e6f525459dddba86f7d8c73 1cf233307aab60c487cab28cb2060ba2e17ebac5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 22 21:03:21 2013 +0100

    Merge branch 'port_applets'
    
    REVIEW: 110120

 .../contents/ui/ConversationDelegateButton.qml     |  3 +-
 chat/org.kde.ktp-chat/contents/ui/main.qml         | 34 ++++++++++++++--------
 .../contents/ui/ContactList.qml                    | 18 ++++++------
 .../contents/ui/ListContactDelegate.qml            |  2 +-
 .../org.kde.ktp-contactlist/contents/ui/main.qml   |  5 ++++
 5 files changed, 38 insertions(+), 24 deletions(-)

-- 
ktp-contact-applet packaging