[Pkg-owncloud-commits] [owncloud-client] 276/470: Merge pull request #4641 from owncloud/bubbleUpConflicts

[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 52a52341227bb9dc31af74bae0645d96b8ece469
Merge: 15bdb7b 4e17dab
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Apr 6 13:45:47 2016 +0200

    Merge pull request #4641 from owncloud/bubbleUpConflicts
    
    Bubble up conflicts: Show a tray notification on conflicts and show the conflicts in the not-synced list.

 src/gui/folder.cpp                 | 31 ++++++++++++++++++++++++-------
 src/gui/folder.h                   |  1 +
 src/libsync/progressdispatcher.cpp |  2 +-
 src/libsync/syncfileitem.h         |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)

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