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

The following commit has been merged in the master branch:
commit a59c29bfdc728b87d2f9b0ae4fbda9c11f715a4d
Merge: b68604650991d5311eb51db752d6bbb1f04d04b2 6be033478e6fee819ce1c031d354cdbcadcaf062
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 1 19:15:13 2013 +0100

    Merge branch 'kde-telepathy-0.6'
    
    Conflicts:
    	chat/org.kde.ktp-chat/metadata.desktop.cmake
    	presence/plasma-applet-ktp-presence.desktop.cmake

 CMakeLists.txt                                                    | 2 +-
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml                  | 4 +++-
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml        | 2 +-
 chat/org.kde.ktp-chat/contents/ui/main.qml                        | 8 ++++----
 .../org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml   | 8 +++++---
 5 files changed, 14 insertions(+), 10 deletions(-)

-- 
ktp-contact-applet packaging