[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=3cc21b2

The following commit has been merged in the master branch:
commit 3cc21b24933e2c109047c63bf2848b47585f9ba2
Merge: 1a0bad7e2d5aa289db783e49ae7fb9520ed88542 b2c3b1de5c62c2f60caeea4660d057d72ba98283
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Sat Apr 2 02:37:41 2011 +0200

    Merge branch 'master' of git://anongit.kde.org/telepathy-chat-handler

 config/chatwindowconfig.ui | 201 ++++++++++++++++++++++++++++++---------------
 config/main-window.cpp     |  33 ++++++++
 config/main-window.h       |   3 +
 lib/adium-theme-view.cpp   |  61 ++++++++++++++
 lib/adium-theme-view.h     |  10 ++-
 lib/chat-window-style.cpp  |  14 ++++
 lib/chat-window-style.h    |   2 +
 7 files changed, 255 insertions(+), 69 deletions(-)

-- 
ktp-text-ui packaging