[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=016d626

The following commit has been merged in the master branch:
commit 016d626fe8ad0820c9fc7b972986a1e5530b9537
Merge: b240293a307a40b94f550cf2b4189bbfcc636d76 59e2a6bc4f8ad943c75573e435ed4d9187062d76
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jul 20 17:08:47 2015 +0200

    Merge branch 'Applications/15.08'
    
    Conflicts:
    	plugins/CMakeLists.txt

 plugins/CMakeLists.txt                               |  8 ++++----
 plugins/kaccounts/kaccounts-ui-provider.cpp          |  3 ++-
 plugins/morse/CMakeLists.txt                         | 12 +++++++-----
 plugins/morse/Messages.sh                            |  2 +-
 plugins/morse/main-options-widget.ui                 | 12 +-----------
 plugins/morse/morse-account-ui-plugin.cpp            |  1 -
 plugins/sipe/CMakeLists.txt                          |  2 ++
 plugins/sunshine/CMakeLists.txt                      |  6 ++++--
 plugins/sunshine/sunshine-account-ui-plugin.cpp      |  1 -
 plugins/sunshine/sunshine-advanced-options-widget.ui | 16 ++--------------
 plugins/sunshine/sunshine-main-options-widget.ui     | 14 ++------------
 11 files changed, 25 insertions(+), 52 deletions(-)

-- 
ktp-accounts-kcm packaging