[Pkg-owncloud-commits] [owncloud-client] 26/27: Merge tag 'upstream/1.6.2+dfsg'

[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 40a297956e6f37c2a8258c46b544308f4a06ee64
Merge: 7f07f3e a3a25eb
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue Jul 29 17:22:52 2014 +0200

    Merge tag 'upstream/1.6.2+dfsg'
    
    Upstream version 1.6.2+dfsg
    
    # gpg: Unterschrift vom Di 29 Jul 2014 17:22:46 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                       |  2 +-
 ChangeLog                                  | 15 ++++++++
 VERSION.cmake                              |  2 +-
 cmake/modules/NSIS.template.in             | 10 ++---
 src/creds/httpcredentials.cpp              | 50 +++++++++++++++++++------
 src/creds/httpcredentials.h                |  1 +
 src/creds/shibboleth/shibbolethwebview.cpp | 14 ++++++-
 src/creds/shibboleth/shibbolethwebview.h   |  1 +
 src/mirall/folder.cpp                      |  5 +--
 src/mirall/owncloudpropagator.cpp          |  9 ++++-
 src/mirall/owncloudsetupwizard.cpp         | 22 ++++++++++-
 src/mirall/owncloudsetupwizard.h           |  1 +
 src/mirall/propagator_legacy.cpp           | 49 ++++++++++++++++++------
 src/mirall/propagator_legacy.h             |  6 ++-
 src/mirall/propagator_qnam.cpp             | 60 ++++++++++++++++++++++++++----
 src/mirall/propagator_qnam.h               | 11 +++---
 src/mirall/protocolwidget.cpp              |  7 ++++
 src/mirall/syncengine.cpp                  | 25 +++++++------
 src/mirall/syncengine.h                    |  3 +-
 19 files changed, 227 insertions(+), 66 deletions(-)

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