[Pkg-owncloud-commits] [owncloud-client] 95/175: Merge remote-tracking branch 'origin/checksum_1.8' into 1.8

[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 6b9e1238160f742357e0db53636549bb37d99d6a
Merge: fb2295f d2fff2c
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri May 22 10:32:37 2015 +0200

    Merge remote-tracking branch 'origin/checksum_1.8' into 1.8

 CMakeLists.txt                                |   2 +-
 ChangeLog                                     |   3 +
 cmake/modules/QtVersionAbstraction.cmake      |   1 +
 config.h.in                                   |   2 +
 src/libsync/CMakeLists.txt                    |  10 +-
 src/libsync/configfile.cpp                    |  15 +++
 src/libsync/configfile.h                      |   6 +
 src/libsync/filesystem.cpp                    |  59 ++++++++++
 src/libsync/filesystem.h                      |   9 ++
 src/libsync/networkjobs.cpp                   |   1 -
 src/libsync/owncloudpropagator.cpp            |  15 +++
 src/libsync/propagatedownload.cpp             |  19 ++-
 src/libsync/propagatedownload.h               |  10 +-
 src/libsync/propagateupload.cpp               |  49 +++++++-
 src/libsync/propagateupload.h                 |  10 ++
 src/libsync/propagatorjobs.h                  |  16 +++
 src/libsync/syncfileitem.h                    |   1 +
 src/libsync/theme.cpp                         |   9 +-
 src/libsync/theme.h                           |   9 +-
 src/libsync/transmissionchecksumvalidator.cpp | 151 ++++++++++++++++++++++++
 src/libsync/transmissionchecksumvalidator.h   |  74 ++++++++++++
 src/libsync/utility.cpp                       |  20 +++-
 src/libsync/utility.h                         |   2 +-
 test/CMakeLists.txt                           |   2 +
 test/testfilesystem.h                         |  93 +++++++++++++++
 test/testtranschecksumvalidator.h             | 159 ++++++++++++++++++++++++++
 26 files changed, 728 insertions(+), 19 deletions(-)


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