[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=229851a

The following commit has been merged in the master branch:
commit 229851a11c450c7660551849ebfdd3ce5a9337da
Merge: a345d55f0fd4f8ae059ab4b2d0118c8c9126e0b9 3c6fe56916f9771b133e7d4c6efe6cd4f19c5911
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Tue Jan 11 22:31:14 2011 +0100

    merged.

 CMakeLists.txt                                     |   2 +
 haze/CMakeLists.txt                                |  40 ++++
 {idle => haze}/Messages.sh                         |   2 +-
 .../haze-account-ui-plugin.cpp                     |  31 ++-
 .../haze-account-ui-plugin.h                       |  12 +-
 .../haze-icq-account-ui.cpp                        |  39 ++--
 .../haze-icq-account-ui.h                          |  12 +-
 .../icq-advanced-options-widget.cpp                |  39 +---
 .../icq-advanced-options-widget.h                  |  12 +-
 .../icq-main-options-widget.cpp                    |  22 +-
 .../icq-main-options-widget.h                      |  12 +-
 haze/icq-main-options-widget.ui                    |  68 ++++++
 haze/icq-server-settings-widget.cpp                | 245 +++++++++++++++++++++
 .../icq-server-settings-widget.h                   |  12 +-
 haze/icq-server-settings-widget.ui                 | 185 ++++++++++++++++
 haze/kcmtelepathyaccounts_plugin_haze.desktop      |  16 ++
 16 files changed, 646 insertions(+), 103 deletions(-)

diff --cc CMakeLists.txt
index 06b4322,2f49526..9aec0ec
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -22,4 -22,5 +22,6 @@@ include_directories (${KDE4_INCLUDES
  
  add_subdirectory (gabble)
  add_subdirectory (butterfly)
 +add_subdirectory (idle)
+ add_subdirectory (haze)
+ 

-- 
ktp-accounts-kcm packaging