[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=7ac3224

The following commit has been merged in the master branch:
commit 7ac3224df135e6945f1e970b4f562a2e87655a38
Merge: 693bca37a3b0085f230c8f6eb63d354e35cba18a d50bc019b36b7f00ce4fcbe13116b98d0ceb189c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Dec 28 12:43:24 2011 +0100

    Merge branch 'msn-gabble'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>

 data/profiles/msn-xmpp.profile                     | 16 +++++++++++
 plugins/gabble/CMakeLists.txt                      |  3 ++
 plugins/gabble/gabble-account-ui.cpp               |  5 +++-
 .../main-options-widget-msn.cpp}                   | 33 +++++++++++++---------
 ...widget-facebook.h => main-options-widget-msn.h} | 23 ++++++++-------
 plugins/gabble/main-options-widget-msn.ui          | 28 ++++++++++++++++++
 6 files changed, 82 insertions(+), 26 deletions(-)

-- 
ktp-accounts-kcm packaging