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

The following commit has been merged in the master branch:
commit c30adc2e67f6f3a3f94b7e773eac7794ae78e0dd
Merge: 6ead1063951226320fc72efa7aa9051f2adb091a 749ede8940f012ad8d5fe151404e156e135bce53
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Nov 13 13:43:13 2014 +0100

    Merge branch 'frameworks'
    
    Conflicts:
    	CMakeLists.txt

 50-renameKTpApplets.js                             |  85 -----------
 CMakeLists.txt                                     |  35 ++---
 chat/CMakeLists.txt                                |   4 +-
 .../contents/ui/ActionDelegate.qml                 |   6 +-
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml   |  98 +++----------
 .../contents/ui/ConversationDelegate.qml           |  32 ++--
 .../contents/ui/ConversationDelegateButton.qml     |  92 ++++++++----
 .../contents/ui/{main.qml => FullChatList.qml}     |  58 +++++---
 .../contents/ui/OutgoingDelegate.qml               |   2 +-
 chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml |   4 +-
 chat/org.kde.ktp-chat/contents/ui/main.qml         | 163 +++++----------------
 chat/org.kde.ktp-chat/metadata.desktop.cmake       |   1 -
 contact/src/declarative/contents/ui/Avatar.qml     |   4 +-
 contact/src/declarative/contents/ui/Contact.qml    |   2 +-
 .../src/declarative/contents/ui/DropDownMenu.qml   |   2 +-
 contact/src/declarative/contents/ui/main.qml       |   2 +-
 contact/src/telepathy-contact.cpp                  |   4 +-
 .../contents/ui/ContactList.qml                    |  73 ++++++---
 .../contents/ui/ExternalLabel.qml                  |   4 +-
 .../contents/ui/ListContactDelegate.qml            |  19 +--
 .../contents/ui/Presence.qml                       |  21 +--
 .../org.kde.ktp-contactlist/contents/ui/main.qml   |  68 +++++++--
 .../org.kde.ktp-contactlist/metadata.desktop.cmake |   6 +-
 23 files changed, 329 insertions(+), 456 deletions(-)

-- 
ktp-contact-applet packaging