[Pkg-owncloud-commits] [owncloud-client] 350/498: Merge remote-tracking branch 'origin/hidden_file_handling'

[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 0a6aa88d72e73abb74da75eadcfeabeefe97b969
Merge: bc542a4 c72b6fb
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Jul 17 09:32:29 2015 +0200

    Merge remote-tracking branch 'origin/hidden_file_handling'

 csync/src/csync.c                     |   4 +
 csync/src/csync.h                     |  59 ++++++------
 csync/src/csync_exclude.h             |   3 +-
 csync/src/csync_private.h             |   2 +
 csync/src/csync_statedb.c             |   5 +-
 csync/src/csync_update.c              |  82 +++++++++-------
 csync/src/vio/csync_vio_local_win.c   |   7 +-
 src/cmd/cmd.cpp                       |   8 ++
 src/gui/accountsettings.cpp           |  11 +++
 src/gui/folder.cpp                    |  16 +++
 src/gui/folder.h                      |   9 ++
 src/gui/folderman.cpp                 |   1 +
 src/gui/folderwatcher.cpp             |  25 ++++-
 src/gui/folderwatcher.h               |   5 +
 src/gui/ignorelisteditor.cpp          |  23 +++++
 src/gui/ignorelisteditor.h            |   2 +
 src/gui/ignorelisteditor.ui           | 177 +++++++++++++++++++---------------
 src/libsync/discoveryphase.cpp        |   3 +
 src/libsync/filesystem.cpp            |   3 +-
 src/libsync/syncengine.cpp            |  21 +++-
 src/libsync/syncfileitem.h            |   3 +-
 src/libsync/syncjournaldb.cpp         |  20 +++-
 src/libsync/syncjournalfilerecord.cpp |   4 +-
 src/libsync/syncjournalfilerecord.h   |  11 ++-
 24 files changed, 343 insertions(+), 161 deletions(-)

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