[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=2335e99

The following commit has been merged in the master branch:
commit 2335e99bd85283b158b46a0e93f8b5d44ebae61b
Merge: 988d4b8817b4d365b8f945e45c326f650b6a259e fbc7f93759b888c396561d9586acfbe52cc13afe
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Jun 10 17:14:54 2015 +0200

    Merge branch 'accountStorageInterface'

 CMakeLists.txt                                     |   2 +-
 .../{ => disabled}/facebook-im.service.in          |   0
 data/kaccounts/ktp-gadugadu.provider.in            |   8 +-
 data/kaccounts/ktp-haze-gadugadu-im.service.in     |  11 ++
 data/kaccounts/ktp-haze-icq-im.service.in          |  11 ++
 data/kaccounts/ktp-haze-icq.provider.in            |   8 +-
 data/kaccounts/ktp-haze-sametime-im.service.in     |  11 ++
 data/kaccounts/ktp-haze-sametime.provider.in       |   8 +-
 data/kaccounts/ktp-haze-yahoo-im.service.in        |  11 ++
 data/kaccounts/ktp-haze-yahoo.provider.in          |   8 +-
 data/kaccounts/ktp-jabber-im.service.in            |  11 ++
 data/kaccounts/ktp-jabber.provider.in              |   8 +-
 data/kaccounts/ktp-kde-talk-im.service.in          |  11 ++
 data/kaccounts/ktp-kde-talk.provider.in            |   8 +-
 data/kaccounts/ktp-morse-telegram-im.service.in    |  11 ++
 data/kaccounts/ktp-morse-telegram.provider.in      |   1 +
 plugins/kaccounts/kaccounts-ui-provider.cpp        | 174 ++++++++++-----------
 plugins/kaccounts/kaccounts-ui-provider.h          |   1 -
 18 files changed, 172 insertions(+), 131 deletions(-)

-- 
ktp-accounts-kcm packaging