[Pkg-owncloud-commits] [owncloud-client] 30/332: Merge pull request #1839 from owncloud/directDownload

[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 06863ca9c6a55028aa25227404931ffec02bf1e0
Merge: 1af3d3f e49b898
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Jun 3 16:44:05 2014 +0200

    Merge pull request #1839 from owncloud/directDownload
    
    Direct download URL support + global variable refactoring
    
    Reviewed offline by @dragotin

 csync/src/csync.c                                  |  16 +-
 csync/src/csync.h                                  |   2 +
 csync/src/csync_owncloud.c                         | 525 +++++++--------------
 csync/src/csync_owncloud.h                         | 159 +------
 .../{csync_owncloud.h => csync_owncloud_private.h} | 146 +++---
 csync/src/csync_owncloud_recursive_propfind.c      | 118 ++---
 csync/src/csync_owncloud_util.c                    | 142 +++++-
 csync/src/csync_private.h                          |  19 +-
 csync/src/csync_update.c                           |  27 +-
 csync/src/csync_util.c                             |  53 ---
 csync/src/csync_util.h                             |   3 -
 csync/src/vio/csync_vio.c                          |  24 +-
 csync/src/vio/csync_vio.h                          |   3 -
 csync/src/vio/csync_vio_file_stat.c                |  18 +-
 csync/src/vio/csync_vio_file_stat.h                |  35 +-
 csync/src/vio/csync_vio_local.c                    |  11 -
 src/creds/tokencredentials.cpp                     |   9 +-
 src/mirall/propagator_legacy.cpp                   |   4 +
 src/mirall/propagator_qnam.cpp                     |  86 +++-
 src/mirall/propagator_qnam.h                       |  13 +-
 src/mirall/syncengine.cpp                          |   8 +-
 src/mirall/syncfileitem.h                          |   2 +
 22 files changed, 575 insertions(+), 848 deletions(-)

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