[Pkg-owncloud-commits] [owncloud-client] 18/20: Merge tag 'upstream/1.6.4+dfsg' into sid

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch sid
in repository owncloud-client.

commit cbcbb44e5cc59e17da3c0cbbbadd01046bd613e1
Merge: ae5cd49 74f0dde
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Oct 24 19:00:54 2014 +0200

    Merge tag 'upstream/1.6.4+dfsg' into sid
    
    Upstream version 1.6.4+dfsg

 .tag                                        |  2 +-
 ChangeLog                                   | 13 +++++
 VERSION.cmake                               |  2 +-
 cmake/modules/DefineCMakeDefaults.cmake     |  4 ++
 cmake/modules/DefineCompilerFlags.cmake     |  4 ++
 cmake/modules/DefineInstallationPaths.cmake |  4 ++
 cmake/modules/DefinePlatformDefaults.cmake  |  4 ++
 cmake/modules/FindINotify.cmake             |  4 ++
 cmake/modules/FindPackageVersionCheck.cmake |  4 ++
 cmake/modules/FindPdfLatex.cmake            |  4 ++
 cmake/modules/FindQt5Keychain.cmake         |  4 ++
 cmake/modules/FindQtKeychain.cmake          |  4 ++
 cmake/modules/FindSphinx.cmake              |  4 ++
 cmake/modules/MacroCopyFile.cmake           |  4 ++
 cmake/modules/NSIS.template.in              |  1 +
 cmake/modules/QtVersionAbstraction.cmake    |  4 ++
 cmake/modules/UseDoxygen.cmake              |  4 ++
 cmake/modules/Warnings.cmake                |  4 ++
 csync/src/vio/csync_vio_local.c             |  2 +-
 src/CMakeLists.txt                          |  8 ++-
 src/mirall/account.h                        |  2 +
 src/mirall/application.cpp                  | 13 +++--
 src/mirall/filesystem.cpp                   | 29 ++++++++++-
 src/mirall/filesystem.h                     |  8 +++
 src/mirall/folder.cpp                       |  5 +-
 src/mirall/folderman.cpp                    | 40 ++++++++++-----
 src/mirall/networkjobs.cpp                  | 23 ++++++---
 src/mirall/networkjobs.h                    |  4 +-
 src/mirall/owncloudgui.cpp                  |  7 +++
 src/mirall/propagator_qnam.cpp              | 75 ++++++++++++++++++++---------
 src/mirall/propagator_qnam.h                |  2 +
 31 files changed, 235 insertions(+), 57 deletions(-)

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