[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=200c7c9

The following commit has been merged in the master branch:
commit 200c7c95728af21887be6cfe65c0ea66464c260b
Merge: cc4b5867ee163e987b0c0d875394f03fe57724d5 e1453a00e5556e615cabd567fe32544b457cd0d3
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Apr 1 12:27:31 2012 +0300

    Merge branch 'kde-telepathy-0.3'
    
    Conflicts:
    	plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop
    	plugins/gabble/ktpaccountskcm_plugin_gabble.desktop
    	plugins/haze/ktpaccountskcm_plugin_haze.desktop
    	plugins/idle/ktpaccountskcm_plugin_idle.desktop
    	plugins/rakia/ktpaccountskcm_plugin_rakia.desktop
    	plugins/salut/ktpaccountskcm_plugin_salut.desktop
    	plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop
    	src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
    	src/kcm_ktp_accounts.desktop
    	src/settings-im-and-voip.desktop

 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 ++
 src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop | 1 +
 src/kcm_ktp_accounts.desktop                                            | 1 +
 src/settings-im-and-voip.desktop                                        | 1 +
 10 files changed, 15 insertions(+)

-- 
ktp-accounts-kcm packaging