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

The following commit has been merged in the master branch:
commit cd0918942c551046fda1b645d434dd952e24296b
Merge: d2db0909193bd84036d5a2200bc3ac45494059c2 14ec8ca3c1d017ca4e357984d818f1a9f7592cc5
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Fri Jan 14 01:37:03 2011 +0100

    Merge branch 'gabble'

 butterfly/butterfly-account-ui.cpp |   5 +-
 butterfly/butterfly-account-ui.h   |   3 +-
 butterfly/main-options-widget.cpp  |  74 +----------
 butterfly/main-options-widget.h    |   6 +-
 gabble/CMakeLists.txt              |   1 -
 gabble/advanced-options-widget.cpp | 101 ---------------
 gabble/advanced-options-widget.h   |  47 -------
 gabble/gabble-account-ui.cpp       |  22 ++--
 gabble/gabble-account-ui.h         |   6 +-
 gabble/main-options-widget.cpp     |  81 +------------
 gabble/main-options-widget.h       |   6 +-
 gabble/proxy-settings-widget.cpp   | 243 ++-----------------------------------
 gabble/proxy-settings-widget.h     |   6 +-
 gabble/server-settings-widget.cpp  | 198 ++----------------------------
 gabble/server-settings-widget.h    |   6 +-
 idle/advanced-options-widget.cpp   | 133 ++------------------
 idle/advanced-options-widget.h     |   6 +-
 idle/idle-account-ui.cpp           |  10 +-
 idle/idle-account-ui.h             |   6 +-
 idle/main-options-widget.cpp       |  91 +-------------
 idle/main-options-widget.h         |   6 +-
 21 files changed, 72 insertions(+), 985 deletions(-)

-- 
ktp-accounts-kcm packaging