[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=1197f66

The following commit has been merged in the master branch:
commit 1197f6671b642e2706310321bb7b79a3835ac0ea
Merge: ea4456f353725b9850af69657e742d9889f8c2b3 900824a2f8ea5eb35a483e40498a593842bdb7ce
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Sep 20 21:39:43 2012 +0100

    Merge branch 'kde-telepathy-0.5'

 .../ktpaccountskcm_plugin_butterfly.desktop        |  4 +-
 .../gabble/ktpaccountskcm_plugin_gabble.desktop    |  6 +--
 plugins/haze/ktpaccountskcm_plugin_haze.desktop    |  6 +--
 plugins/idle/ktpaccountskcm_plugin_idle.desktop    |  4 +-
 plugins/rakia/ktpaccountskcm_plugin_rakia.desktop  |  6 +--
 plugins/salut/ktpaccountskcm_plugin_salut.desktop  |  6 +--
 .../ktpaccountskcm_plugin_sunshine.desktop         |  6 +--
 .../ktpaccountskcminternal-accountuiplugin.desktop |  3 +-
 src/KCMTelepathyAccounts/profile-list-model.cpp    | 47 ++++++++++++++++++----
 src/KCMTelepathyAccounts/profile-list-model.h      |  4 +-
 src/kcm_ktp_accounts.desktop                       |  3 --
 src/settings-im-and-voip.desktop                   |  2 -
 12 files changed, 51 insertions(+), 46 deletions(-)

-- 
ktp-accounts-kcm packaging