[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=c3524dc

The following commit has been merged in the master branch:
commit c3524dca53e7d9aeeae7dbd8664643b939999972
Merge: 95c5cbdfff1815133f7da62db8b118c2989e50a5 9b096e0ef205b1c943cd3838ac9eb7427d8115f5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jul 12 16:35:03 2012 +0100

    Merge branch 'master' of git://anongit.kde.org/ktp-text-ui

 .../ktptextui_message_filter_emoticons.desktop     |   6 +
 .../ktptextui_message_filter_formatting.desktop    |   6 +
 .../images/ktptextui_message_filter_images.desktop |   6 +
 lib/adium-theme-header-info.cpp                    |   7 +
 lib/adium-theme-view.cpp                           |   6 +
 lib/adium-theme-view.h                             |   2 +
 lib/ktptxtui_message_filter.desktop                |   6 +
 logviewer/CMakeLists.txt                           |   2 +
 logviewer/entity-model-item.cpp                    | 120 +++++++++++++++++
 logviewer/{message-view.h => entity-model-item.h}  |  44 ++++---
 logviewer/entity-model.cpp                         | 145 +++++++++++++++++----
 logviewer/entity-model.h                           |  25 ++--
 .../{entity-view.h => entity-proxy-model.cpp}      |  35 ++---
 logviewer/{entity-view.h => entity-proxy-model.h}  |  26 ++--
 logviewer/entity-view.cpp                          |   7 +-
 logviewer/entity-view.h                            |   4 +-
 logviewer/log-viewer.cpp                           |  33 ++++-
 logviewer/log-viewer.ui                            |  55 ++++----
 18 files changed, 421 insertions(+), 114 deletions(-)

-- 
ktp-text-ui packaging