[Pkg-owncloud-commits] [owncloud-client] 444/470: Merge branch 'overlayIconFixes' into 2.2 (#4765)

[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 064c2b678aa74face9f50542cd059fd4018a242b
Merge: 641125e e58739d
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Tue May 3 13:04:34 2016 +0200

    Merge branch 'overlayIconFixes' into 2.2 (#4765)

 src/gui/accountstate.cpp              |  8 ++-
 src/gui/accountstate.h                |  4 +-
 src/gui/folder.cpp                    |  7 ++-
 src/gui/folder.h                      |  3 +-
 src/gui/folderman.cpp                 | 17 +++++-
 src/gui/folderman.h                   |  1 +
 src/gui/socketapi.cpp                 | 31 ++++++-----
 src/gui/socketapi.h                   |  1 +
 src/libsync/syncengine.cpp            |  2 +-
 src/libsync/syncfilestatustracker.cpp | 98 +++++++++++++----------------------
 src/libsync/syncfilestatustracker.h   |  5 +-
 11 files changed, 85 insertions(+), 92 deletions(-)

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