[Pkg-owncloud-commits] [owncloud-client] 50/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 7fcf6f9f7997c9c141fe7f29a9de661d3cee5170
Merge: bd48ab2 b814b45
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Jun 5 12:01:50 2014 +0200

    Merge branch '1.6'

 VERSION.cmake                     |  4 ++--
 cmake/modules/NSIS.template.in    |  6 ++++++
 csync/src/csync_statedb.c         |  3 ++-
 src/mirall/owncloudpropagator.cpp | 35 +++++++++++++++++++++++++++++------
 4 files changed, 39 insertions(+), 9 deletions(-)


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