[Pkg-owncloud-commits] [owncloud-client] 97/333: Merge branch '1.5'

[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 e5a8cd45214ace6edcb93ef99d075137b82d1feb
Merge: 3f3577d f348499
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Mar 6 14:10:08 2014 +0100

    Merge branch '1.5'
    
    Conflicts:
    	VERSION.cmake

 CMakeLists.txt                                |   3 +
 admin/osx/sign_dmg.sh                         |  27 ++-
 csync/ConfigureChecks.cmake                   |   5 -
 csync/src/csync_owncloud.c                    |   5 -
 src/CMakeLists.txt                            |   2 +
 src/creds/httpcredentials.cpp                 |  49 ++++-
 src/creds/shibboleth/authenticationdialog.cpp |  56 ++++++
 src/creds/shibboleth/authenticationdialog.h   |  41 ++++
 src/creds/shibboleth/shibbolethwebview.cpp    |  26 ++-
 src/creds/shibboleth/shibbolethwebview.h      |   1 +
 src/mirall/account.cpp                        |   5 +
 src/mirall/account.h                          |   2 +
 src/mirall/application.cpp                    |  34 +---
 src/mirall/application.h                      |   1 -
 src/mirall/connectionvalidator.cpp            |  13 +-
 src/mirall/networkjobs.cpp                    |   7 +-
 src/mirall/networksettings.ui                 | 278 ++++++++++++++------------
 src/wizard/owncloudshibbolethcredspage.cpp    |   1 +
 18 files changed, 362 insertions(+), 194 deletions(-)


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