[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=4d05a1b

The following commit has been merged in the master branch:
commit 4d05a1bc69178265d995778f8ff4ddabcb81bc54
Merge: 809a18961ac3560d6840c7cb6048bf2e2bf7f020 ae56f6c10f3cdedbe8088c71c24b555531b25b8d
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Apr 12 19:18:31 2013 +0200

    Merge branch 'kde-telepathy-0.6'

 CMakeLists.txt                 |  2 ++
 KTp/CMakeLists.txt             |  1 +
 KTp/Declarative/CMakeLists.txt |  1 +
 KTp/Models/CMakeLists.txt      |  1 +
 KTp/Widgets/CMakeLists.txt     |  1 +
 KTp/contact-info-dialog.cpp    | 22 ++++++++++++----------
 KTp/ktp-export.h => global.cpp | 29 ++++-------------------------
 7 files changed, 22 insertions(+), 35 deletions(-)

-- 
ktp-common-internals packaging