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

Sat May 28 00:05:15 UTC 2016

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

The following commit has been merged in the master branch:
commit 07c7369088e852a9a9615362e499d859d74685ba
Merge: e2be6dd3ed5312aac07f893ccd5e6016ca1a335a 676d28db77e83baed7de49353371045336cd1ace
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Oct 25 22:22:59 2013 +0200

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake
    	src/settings-im-and-voip.desktop

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

-- 
ktp-accounts-kcm packaging