[Pkg-owncloud-commits] [owncloud-client] 126/332: Merge remote-tracking branch 'origin/il'

[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 94ddf7e5d827d80d459a9d2c173abc128ccf9416
Merge: f45dd8e b735dc0
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jun 24 08:40:27 2014 +0200

    Merge remote-tracking branch 'origin/il'

 src/mirall/owncloudpropagator.cpp |  9 ++++++---
 src/mirall/progressdispatcher.cpp |  2 +-
 src/mirall/syncengine.cpp         | 11 +++++------
 src/mirall/syncfileitem.h         |  3 ++-
 4 files changed, 14 insertions(+), 11 deletions(-)


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