[Pkg-owncloud-commits] [owncloud-client] 105/115: Merge pull request #2084 from owncloud/contextless_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 c473428be6b2db506f8891c86509126e4c7b83ba
Merge: 2219d40 e06e5fe
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Aug 21 13:15:18 2014 +0200

    Merge pull request #2084 from owncloud/contextless_exclude
    
    Contextless exclude, @ogoffart reviewed, I'll merge.

 csync/src/csync.c                             |  2 +-
 csync/src/csync_exclude.c                     | 48 ++++++++++++++++-----------
 csync/src/csync_exclude.h                     | 10 +++++-
 csync/tests/csync_tests/check_csync_exclude.c | 31 ++++-------------
 src/mirall/folderman.cpp                      |  6 ++++
 src/mirall/socketapi.cpp                      | 44 ++++++++++++++++++------
 src/mirall/socketapi.h                        |  8 ++++-
 7 files changed, 93 insertions(+), 56 deletions(-)

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