[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=e551de5

The following commit has been merged in the master branch:
commit e551de50d8cf0ff03be92c6085c7f983807ca453
Merge: 5e4c85ecd8835906bb334db5583d080c05b2db36 e2aa9b3652d8701b925fe50a9bdd13107de04ebc
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Apr 1 12:31:11 2012 +0300

    Merge branch 'kde-telepathy-0.3'
    
    Conflicts:
    	contact-applet/plasma_applet_ktp_contact.desktop

 CMakeLists.txt                                   | 2 --
 contact-applet/plasma_applet_ktp_contact.desktop | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --cc CMakeLists.txt
index a7de9ae,50e94f3..de68798
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,7 -1,5 +1,5 @@@
 -project(ktp-contact-applet)
 +project(ktp_plasma)
  
- cmake_minimum_required(VERSION 2.8)
- 
  set(CMAKE_MODULE_PATH
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
      ${CMAKE_MODULE_PATH}

-- 
ktp-contact-applet packaging