[Pkg-owncloud-commits] [owncloud-client] 101/484: Merge branch 'master'

[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 671af9f8fe600a3f0c9f35e6090a6ec00d31971e
Merge: 6ea05ff 00485e1
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Oct 19 15:53:58 2015 +0200

    Merge branch 'master'

 VERSION.cmake                      |  2 +-
 src/libsync/abstractnetworkjob.cpp |  2 +-
 src/libsync/abstractnetworkjob.h   |  3 ++-
 src/libsync/account.cpp            | 16 ++++++++++++++++
 src/libsync/account.h              |  4 ++++
 src/libsync/discoveryphase.cpp     |  7 +++++++
 src/libsync/discoveryphase.h       |  5 ++++-
 src/libsync/networkjobs.cpp        | 15 ++++++++++-----
 src/libsync/propagateupload.cpp    |  6 +-----
 src/libsync/syncengine.cpp         |  9 +++++++--
 10 files changed, 53 insertions(+), 16 deletions(-)

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