[Pkg-owncloud-commits] [owncloud-client] 69/219: Merge pull request #2162 from ckamm/error-missing-exclude

[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 3a59dd24f3c147ca3fe6efdef410e2c648e2508d
Merge: da94533 1cf1f6e
Author: ckamm <kamm at incasoftware.de>
Date:   Thu Sep 4 14:14:07 2014 +0200

    Merge pull request #2162 from ckamm/error-missing-exclude
    
    Don't do a broken sync when the system exclude file is missing

 CMakeLists.txt                  |  1 +
 src/mirall/folder.cpp           | 23 ++++++++++++++++++-----
 src/mirall/folder.h             |  2 +-
 src/mirall/mirallconfigfile.cpp |  8 ++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)


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