[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=788d250

The following commit has been merged in the master branch:
commit 788d250b8d8f21da61310deb7e97facf2d20f054
Merge: b805b82c0dbd21927f1151d8340288243ffdbd0e bb1e2cb5b72cb4d9b81180c63024c89319eefbf7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Feb 10 16:55:20 2012 +0100

    Merge branch 'kde-telepathy-0.3'

 plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop     |  1 +
 plugins/gabble/ktpaccountskcm_plugin_gabble.desktop           |  2 ++
 plugins/haze/ktpaccountskcm_plugin_haze.desktop               |  2 ++
 plugins/idle/ktpaccountskcm_plugin_idle.desktop               |  1 +
 plugins/rakia/ktpaccountskcm_plugin_rakia.desktop             |  2 ++
 plugins/salut/ktpaccountskcm_plugin_salut.desktop             |  2 ++
 plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop       |  2 ++
 .../ktpaccountskcminternal-accountuiplugin.desktop            |  1 +
 src/add-account-assistant.cpp                                 | 11 -----------
 src/kcm_ktp_accounts.desktop                                  |  2 ++
 src/settings-im-and-voip.desktop                              |  1 +
 11 files changed, 16 insertions(+), 11 deletions(-)

-- 
ktp-accounts-kcm packaging