[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8682bc3

The following commit has been merged in the master branch:
commit 8682bc301e34b0ed2e08751243cc1c42a8ef428f
Merge: 3abb312005344fcf46d9ce9704a21f808d447460 b2e1a0236437872920d2a54eb4d72281a25d66cf
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Mon Jan 31 13:26:16 2011 +0200

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

 app/mainwindow.cpp         |   2 +-
 lib/channelcontactlist.cpp |  13 ++--
 lib/channelcontactlist.h   |   7 ++-
 lib/chatwindow.cpp         | 144 +++++++++++++++++++++++++++++++--------------
 lib/chatwindow.h           |  12 +++-
 5 files changed, 122 insertions(+), 56 deletions(-)

-- 
ktp-text-ui packaging