[Pkg-owncloud-commits] [owncloud-client] 137/498: Merge pull request #3281 from owncloud/confirm

[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 16786eed54a8dcb0dbac937ea13bc1bb33a59dfc
Merge: e135d4c 02ffbf8
Author: Olivier Goffart <olivier at woboq.com>
Date:   Wed Jun 10 13:39:52 2015 +0200

    Merge pull request #3281 from owncloud/confirm
    
    Confirm feature (sync engine part only)

 csync/src/csync_private.h       |   8 ++-
 csync/src/csync_update.c        |  13 +++-
 src/cmd/cmd.cpp                 |  34 ++-------
 src/gui/folder.cpp              |  11 ---
 src/gui/folder.h                |   4 --
 src/gui/folderman.cpp           |   8 ++-
 src/gui/selectivesyncdialog.cpp |  11 ++-
 src/gui/socketapi.cpp           |   2 +-
 src/libsync/discoveryphase.cpp  | 155 +++++++++++++++++++++++++++++++++-------
 src/libsync/discoveryphase.h    |  21 ++++--
 src/libsync/networkjobs.cpp     |   2 +-
 src/libsync/ownsql.cpp          |   3 +-
 src/libsync/syncengine.cpp      |  22 +++---
 src/libsync/syncengine.h        |  14 ++--
 src/libsync/syncjournaldb.cpp   |  63 ++++++++++++++++
 src/libsync/syncjournaldb.h     |  19 +++++
 16 files changed, 288 insertions(+), 102 deletions(-)


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