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

The following commit has been merged in the master branch:
commit dcc70e238479135b4fa44ac32206ba00a7146ceb
Merge: 1ec052e1d9b121659e16745aadcee19c55ba5da1 d363fa89eb26f66d8aac5430ecf9a44d086b005e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Apr 10 15:21:39 2014 +0200

    Merge branch 'kde-telepathy-0.8'

 CMakeLists.txt                                             | 2 +-
 chat/org.kde.ktp-chat/metadata.desktop.cmake               | 3 ---
 contact/plasma-applet-ktp-contact.desktop.cmake            | 3 ---
 contact/src/telepathy-contact.cpp                          | 1 +
 contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake | 3 ---
 presence/plasma-applet-ktp-presence.desktop.cmake          | 1 -
 6 files changed, 2 insertions(+), 11 deletions(-)

-- 
ktp-contact-applet packaging