[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=8b436c4

The following commit has been merged in the master branch:
commit 8b436c4057a218dbdb2516014c223f97d3c104c0
Merge: 0bf889b89b979fdd3ddeb7521d5e7994e258e8b1 d50a497ef70cab9daf0b11ace3b3dcdd8c4be807
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 9 13:44:02 2012 +0100

    Merge branch 'kde-talk'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 103903
    FEATURE: 293660

 .../{msn-xmpp.profile => kde-talk.profile}         | 12 ++---
 plugins/gabble/CMakeLists.txt                      |  2 +
 plugins/gabble/gabble-account-ui.cpp               |  5 ++-
 ...cebook.cpp => main-options-widget-kde-talk.cpp} | 30 ++++++-------
 ...t-facebook.h => main-options-widget-kde-talk.h} | 25 ++++++-----
 ...s-widget.ui => main-options-widget-kde-talk.ui} | 51 +++++++++++++---------
 6 files changed, 73 insertions(+), 52 deletions(-)

-- 
ktp-accounts-kcm packaging