[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=260f2a6

The following commit has been merged in the master branch:
commit 260f2a68a0de76114f77eef20517cc23acd42519
Merge: f65a402d9cc10271c4367d7494d3f78098d9db39 8e917ac9156d4c9b9b71bc3c14c8540cfefbeba6
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Mar 21 19:44:19 2012 +0100

    Merge branch 'adiumThemeFixes'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    
    REVIEW: 104356
    BUG: 296343

 data/CMakeLists.txt                                |   2 +-
 data/Template.html                                 | 343 +++++++++++++++++++++
 .../Contents/Info.plist                            |   4 +-
 .../Contents/README                                |   0
 .../Contents/Resources/Footer.html                 |   0
 .../Contents/Resources/Header.html                 |   0
 .../Contents/Resources/Incoming/Content.html       |   4 +-
 .../Contents/Resources/Incoming/NextContent.html   |   0
 .../Contents/Resources/Incoming/SenderColors.txt   |   0
 .../Contents/Resources/Outgoing/Content.html       |   0
 .../Contents/Resources/Outgoing/NextContent.html   |   0
 .../Contents/Resources/Status.html                 |   2 +-
 .../Contents/Resources/main.css                    |   2 +-
 data/template.html                                 | 343 ---------------------
 lib/adium-theme-view.cpp                           | 157 +++++++---
 lib/adium-theme-view.h                             |  21 +-
 lib/chat-style-plist-file-reader.cpp               |   5 +
 lib/chat-style-plist-file-reader.h                 |   1 +
 lib/chat-window-style.cpp                          | 140 ++++++---
 lib/chat-window-style.h                            |  53 ++--
 20 files changed, 611 insertions(+), 466 deletions(-)

-- 
ktp-text-ui packaging