[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=34ab385

The following commit has been merged in the master branch:
commit 34ab385f5428001f490d4c18f2551162e9bda125
Merge: a228c8db8c29fa62519652eac1d9b901cffda520 427b556ca2a1f8b66d483025ed49e3105c9b867d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jan 22 20:09:03 2011 +0000

    Merge branch 'remove_parameterlist_vs_tree_conflict'

 src/KCMTelepathyAccounts/CMakeLists.txt            |  3 -
 .../abstract-account-parameters-widget.cpp         | 19 +++---
 .../abstract-account-parameters-widget.h           | 19 +++++-
 src/KCMTelepathyAccounts/abstract-account-ui.h     |  1 +
 src/KCMTelepathyAccounts/account-edit-widget.cpp   | 20 ++++---
 src/KCMTelepathyAccounts/account-edit-widget.h     |  4 +-
 .../generic-advanced-options-widget.cpp            | 32 ++++-------
 .../generic-advanced-options-widget.h              |  3 +-
 src/KCMTelepathyAccounts/parameter-edit-model.cpp  | 67 +++++++++++++++++++---
 src/KCMTelepathyAccounts/parameter-edit-model.h    | 12 +++-
 src/add-account-assistant.cpp                      | 11 +---
 src/edit-account-dialog.cpp                        | 22 ++-----
 12 files changed, 127 insertions(+), 86 deletions(-)

-- 
ktp-accounts-kcm packaging