[Pkg-owncloud-commits] [owncloud-client] 375/470: Merge pull request #4689 from owncloud/overlays_handle_root

[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 e5a5b95b9a5871562ff21c72867048cf151c2bec
Merge: 7a82fac 7acdf50
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Apr 21 15:01:11 2016 +0200

    Merge pull request #4689 from owncloud/overlays_handle_root
    
    SyncFileStatusTracker: Add a method to handle the root folder of the sync.
    
    Also, handle new files put in the sync in the statustracker logic.

 shell_integration/nautilus/syncstate.py |  5 ++-
 src/gui/socketapi.cpp                   | 14 +++++--
 src/libsync/syncfilestatustracker.cpp   | 68 +++++++++++++++++++++++++++++----
 src/libsync/syncfilestatustracker.h     |  3 ++
 4 files changed, 78 insertions(+), 12 deletions(-)

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