[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=2c6eef0

The following commit has been merged in the master branch:
commit 2c6eef0b6aa11f54ed4f96f2056f65a2a29405e3
Merge: f7234dfa80f9613748fd6fe6d225365d997d01d2 67eb1423f1faa4f10ae62b3871a95219d8b4b20a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 16 20:34:39 2011 +0000

    Merge branch 'show_account_status'
    
    Conflicts:
    	src/account-item.cpp

 src/CMakeLists.txt             |   1 +
 src/account-item.cpp           |  46 +++++++++++++++++++
 src/account-item.h             |   9 ++--
 src/accounts-list-delegate.cpp | 100 +++++++++++++++++++++++++++++++++++++++++
 src/accounts-list-delegate.h   |  31 +++++++++++++
 src/accounts-list-model.cpp    |  11 +++++
 src/accounts-list-model.h      |   6 +++
 src/kcm-telepathy-accounts.cpp |  21 ++++++++-
 src/kcm-telepathy-accounts.h   |   2 +
 9 files changed, 223 insertions(+), 4 deletions(-)

-- 
ktp-accounts-kcm packaging