[Pkg-owncloud-commits] [owncloud-client] 158/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 9c3c4bac66c1e3744d1c37b38f1dbbd0addaac3b
Merge: 6ec218e 2f28420
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jul 1 20:37:42 2014 +0200

    Merge remote-tracking branch 'origin/il'

 cmake/modules/DefineCompilerFlags.cmake |   2 +-
 cmake/modules/Warnings.cmake            |   2 +
 csync/src/csync_owncloud_util.c         |   8 +-
 csync/src/csync_reconcile.c             |   2 +
 csync/src/csync_update.c                |  30 ++--
 csync/tests/ownCloud/t2.pl              |  24 +++-
 csync/tests/ownCloud/t5.pl              |   1 -
 csync/tests/ownCloud/t7.pl              | 235 ++++++++++++++++++++++++++++++++
 src/creds/httpcredentials.cpp           |   7 +-
 src/mirall/application.cpp              |   2 +-
 src/mirall/owncloudpropagator.cpp       |  15 +-
 src/mirall/owncloudpropagator.h         |   1 +
 src/mirall/propagatorjobs.cpp           |  39 ++++++
 src/mirall/propagatorjobs.h             |   3 +
 src/mirall/syncengine.cpp               |  22 ++-
 15 files changed, 351 insertions(+), 42 deletions(-)


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