[Pkg-owncloud-commits] [owncloud-client] 33/332: Merge branch '1.6'

[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 582a8fe7fd651ed980627336c2cac5dcd02497ac
Merge: 08ca8b5 6e10b8c
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jun 3 17:27:12 2014 +0200

    Merge branch '1.6'

 csync/src/csync_reconcile.c    |  8 ++++++--
 src/mirall/folder.cpp          | 15 +++++++++++++--
 src/mirall/propagator_qnam.cpp |  6 ++++++
 src/mirall/syncjournaldb.cpp   | 22 ++++++++++++++++++++++
 src/mirall/syncjournaldb.h     |  6 ++++++
 5 files changed, 53 insertions(+), 4 deletions(-)


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