[Pkg-owncloud-commits] [owncloud-client] 93/470: Merge pull request #4527 from ckamm/account-pause

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 6e9019120f7f206501912736c5096f1a858811f6
Merge: 17f40f7 d521232
Author: ckamm <mail at ckamm.de>
Date:   Wed Mar 2 10:35:40 2016 +0100

    Merge pull request #4527 from ckamm/account-pause
    
    Account pausing #3829

 src/gui/accountmanager.cpp    | 52 +++++++++++++++++--------
 src/gui/accountmanager.h      | 15 ++++++--
 src/gui/accountstate.cpp      | 15 ++++++++
 src/gui/accountstate.h        | 17 +++++++-
 src/gui/folder.cpp            |  6 ++-
 src/gui/folder.h              |  2 +-
 src/gui/folderman.cpp         |  4 +-
 src/gui/folderstatusmodel.cpp |  4 +-
 src/gui/owncloudgui.cpp       | 90 ++++++++++++++++++++++++++++++++++++++++++-
 src/gui/owncloudgui.h         |  3 ++
 src/libsync/account.cpp       |  2 +-
 src/libsync/account.h         |  2 +-
 test/stub.cpp                 |  2 +-
 13 files changed, 182 insertions(+), 32 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git