[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=60100bc

The following commit has been merged in the master branch:
commit 60100bcc67a5db3fa3351a44703b2a8208005294
Merge: 21d14c76470b6f43af10ea5ab4937542ba58e5c8 2db03095accfbb794c52a45149191608e5b5e36d
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Jan 8 14:31:10 2013 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	CMakeLists.txt

 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --cc CMakeLists.txt
index 417554a,1fccac3..5b31b01
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -39,9 -39,6 +39,8 @@@ set(ktp_auth_handler_SRC
      x-telepathy-password-prompt.cpp
      x-messenger-oauth2-auth-operation.cpp
      x-messenger-oauth2-prompt.cpp
 +    conference-auth-op.cpp
 +    conference-auth-observer.cpp
-     ${ktp_common_internals_SRCS}
  )
  
  configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)

-- 
ktp-auth-handler packaging