[Pkg-owncloud-commits] [owncloud-client] 329/484: Merge pull request #4139 from owncloud/account_toolbox

[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 74ed0b4f096685ce4238dfebf9836fa5305b915d
Merge: 0d21503 becbb7b
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Nov 16 15:53:30 2015 +0100

    Merge pull request #4139 from owncloud/account_toolbox
    
    AccountSettings: Add a toolbox button for the account specific actions.

 src/gui/accountsettings.cpp | 72 ++++++++++++++++++++++++++++++++++++++-------
 src/gui/accountsettings.h   |  7 ++++-
 src/gui/accountsettings.ui  | 63 ++++++++-------------------------------
 src/gui/generalsettings.cpp | 15 ----------
 src/gui/generalsettings.h   |  2 --
 src/gui/generalsettings.ui  | 50 ++++++++++++-------------------
 6 files changed, 99 insertions(+), 110 deletions(-)

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