[Pkg-owncloud-commits] [owncloud-client] 29/333: Merge branch '1.5'

[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 93f31fa9d70d88ca178b712d417071695ab4467f
Merge: 7ae40e1 a677f97
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Feb 12 16:44:24 2014 +0100

    Merge branch '1.5'

 csync/src/csync_reconcile.c       | 35 ++++++++++++++++++-----------------
 csync/tests/ownCloud/t3.pl        | 12 ++++++++++++
 src/mirall/owncloudpropagator.cpp | 30 ++++++++++++++++++++++++------
 src/mirall/syncjournaldb.cpp      | 19 +++++++++++++++++++
 src/mirall/syncjournaldb.h        |  1 +
 5 files changed, 74 insertions(+), 23 deletions(-)


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