[Pkg-owncloud-commits] [owncloud-client] 224/332: Merge branch 'il'

[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 8a88ca6f34b7cdc31dcd7db404fbf0455d3fa2e4
Merge: 74b3e2c 81d7867
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Jul 18 17:00:38 2014 +0200

    Merge branch 'il'
    
    Conflicts:
    	src/mirall/propagator_legacy.h

 ChangeLog                          |  9 +++++++
 cmake/modules/NSIS.template.in     |  4 ++--
 csync/src/csync_owncloud_private.h |  2 +-
 src/mirall/owncloudsetupwizard.cpp | 20 ++++++++++++++--
 src/mirall/owncloudsetupwizard.h   |  1 +
 src/mirall/propagator_legacy.cpp   | 49 ++++++++++++++++++++++++++++----------
 src/mirall/propagator_legacy.h     |  6 ++++-
 src/mirall/propagator_qnam.cpp     | 42 ++++++++++++++++++++++++++------
 src/mirall/propagator_qnam.h       |  9 +++----
 9 files changed, 113 insertions(+), 29 deletions(-)

diff --cc src/mirall/propagator_legacy.h
index eee25c0,40cd5ec..80b7bb1
--- a/src/mirall/propagator_legacy.h
+++ b/src/mirall/propagator_legacy.h
@@@ -53,8 -53,8 +53,8 @@@ class PropagateDownloadFileLegacy: publ
      Q_OBJECT
  public:
      explicit PropagateDownloadFileLegacy(OwncloudPropagator* propagator,const SyncFileItem& item)
-         : PropagateNeonJob(propagator, item), _file(0) {}
+         : PropagateNeonJob(propagator, item), _file(0), _resumeStart(0) {}
 -    void start();
 +    void start() Q_DECL_OVERRIDE;
  private:
      QFile *_file;
      QScopedPointer<ne_decompress, ScopedPointerHelpers> _decompress;

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