[Pkg-owncloud-commits] [owncloud-client] 35/38: Merge tag 'upstream/1.6.3+dfsg' into new_master

[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 9460567ce546c2f12e7700704c413daa66064bb1
Merge: cc60c56 5c9f867
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Sep 5 21:51:42 2014 +0200

    Merge tag 'upstream/1.6.3+dfsg' into new_master
    
    Upstream version 1.6.3+dfsg

 .gitmodules                                        |  2 +-
 .tag                                               |  2 +-
 ChangeLog                                          |  8 ++
 VERSION.cmake                                      |  2 +-
 csync/tests/ownCloud/ownCloud/Test.pm              |  6 +-
 doc/CMakeLists.txt                                 |  2 +-
 src/CMakeLists.txt                                 |  6 +-
 src/creds/shibbolethcredentials.cpp                | 22 +-----
 src/creds/shibbolethcredentials.h                  |  1 -
 src/mirall/account.cpp                             | 73 ++++++++++++++++--
 src/mirall/account.h                               |  8 ++
 src/mirall/accountmigrator.cpp                     | 89 ++++++++++++++++++++++
 src/mirall/accountmigrator.h                       | 38 +++++++++
 src/mirall/accountsettings.cpp                     |  2 +-
 .../shibboleth => mirall}/authenticationdialog.cpp |  0
 .../shibboleth => mirall}/authenticationdialog.h   |  0
 src/mirall/folderman.cpp                           | 12 +++
 src/mirall/folderman.h                             |  3 +-
 src/mirall/mirallaccessmanager.cpp                 | 32 +++++++-
 src/mirall/mirallaccessmanager.h                   |  2 +
 src/mirall/networkjobs.cpp                         |  1 +
 src/mirall/owncloudgui.cpp                         | 47 +++++++++++-
 src/mirall/owncloudgui.h                           |  2 +
 src/mirall/owncloudtheme.cpp                       | 10 +++
 src/mirall/owncloudtheme.h                         |  3 +
 src/mirall/propagator_qnam.cpp                     |  4 +-
 src/mirall/settingsdialog.cpp                      |  7 ++
 src/mirall/settingsdialogmac.cpp                   |  7 +-
 src/mirall/sslbutton.cpp                           |  6 +-
 src/mirall/utility.cpp                             | 12 ---
 src/mirall/utility.h                               |  1 -
 src/wizard/owncloudsetuppage.cpp                   |  6 +-
 src/wizard/owncloudwizard.cpp                      |  1 -
 33 files changed, 356 insertions(+), 61 deletions(-)

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