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

The following commit has been merged in the master branch:
commit dae1053a62733f4710c2654cacf80c294201e73a
Merge: 46140d717b23342fb8a3a74872e1d4912da49272 0ee66e254048498dfb74acb9b1fd224239141f01
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Mon Feb 14 02:07:21 2011 +0200

    Merge branch 'haze-yahoo'

 haze/CMakeLists.txt                                |  6 ++-
 haze/haze-account-ui-plugin.cpp                    |  9 ++++-
 ...aze-icq-account-ui.cpp => haze-icq-account.cpp} |  7 ++--
 haze/{haze-icq-account-ui.h => haze-icq-account.h} |  4 +-
 .../haze-yahoo-account.cpp                         | 43 +++++++++++-----------
 .../idle-account-ui.h => haze/haze-yahoo-account.h | 27 ++++++++------
 haze/icq-main-options-widget.h                     |  4 +-
 .../yahoo-main-options-widget.cpp                  | 31 +++++++---------
 .../yahoo-main-options-widget.h                    | 24 ++++++------
 ...ions-widget.ui => yahoo-main-options-widget.ui} | 17 ++++++---
 10 files changed, 91 insertions(+), 81 deletions(-)

-- 
ktp-accounts-kcm packaging