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

The following commit has been merged in the master branch:
commit 2a9f71fec52aaaf8b2994f987f76ef69e073aa2f
Merge: a2ccf85e6cb3be91f8033c9f3b93235910c545f2 43d175a55b4c70674211f74801a845919c56ab86
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 11 19:32:29 2011 +0100

    Merge branch 'misc_tidy_up'

 app/main.cpp                    |  1 -
 app/telepathy-chat-ui.cpp       |  2 +-
 app/telepathy-chat-ui.h         |  4 ++--
 config/main-window.cpp          |  1 +
 lib/adium-theme-content-info.h  |  2 +-
 lib/adium-theme-header-info.h   | 16 ++++++++--------
 lib/adium-theme-message-info.h  |  2 +-
 lib/adium-theme-status-info.h   |  3 +--
 lib/adium-theme-view.cpp        |  2 +-
 lib/adium-theme-view.h          | 11 +++++------
 lib/chat-search-bar.h           |  4 ++--
 lib/chat-widget.h               | 21 +++++++++++----------
 lib/chat-window-style-manager.h |  2 +-
 lib/chat-window-style.h         |  2 +-
 14 files changed, 36 insertions(+), 37 deletions(-)

-- 
ktp-text-ui packaging