[Pkg-owncloud-commits] [owncloud-client] 92/498: Merge branch '1.8' into 1.9

[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 ac0e08cc91840041b78f8d597c24f3b7b6abe7d4
Merge: 3b34d5b bcc896f
Author: Markus Goetz <markus at woboq.com>
Date:   Tue May 12 23:02:58 2015 +0200

    Merge branch '1.8' into 1.9

 csync/src/csync.c                     | 14 ++++++++++++++
 csync/src/csync_rename.cc             | 16 ++++++++++++++++
 csync/src/csync_rename.h              |  3 +++
 csync/tests/ownCloud/ownCloud/Test.pm |  3 ++-
 src/gui/application.cpp               |  4 ++--
 src/libsync/bandwidthmanager.cpp      |  4 ++--
 src/libsync/propagatedownload.cpp     |  1 +
 src/libsync/syncengine.cpp            | 11 ++++++-----
 test/testxmlparse.h                   |  8 ++++----
 9 files changed, 50 insertions(+), 14 deletions(-)

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