[Pkg-owncloud-commits] [owncloud-client] 100/218: Merge pull request #3802 from owncloud/alt_webdav_url2

[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 eb154de2a1b2a370f719c5383df916bb575bc70e
Merge: 9004fd6 8c2b5af
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Sep 10 17:44:46 2015 +0200

    Merge pull request #3802 from owncloud/alt_webdav_url2
    
    Branding option: Alternative WebDAV URL

 src/cmd/cmd.cpp                      | 27 ++++++++++++++++-----------
 src/gui/socketapi.cpp                |  3 ++-
 src/gui/wizard/owncloudsetuppage.cpp | 18 ++++++++++++------
 src/libsync/account.cpp              | 14 +++++++++++++-
 src/libsync/account.h                |  9 +++++++--
 src/libsync/discoveryphase.cpp       |  2 +-
 src/libsync/owncloudpropagator.cpp   |  2 +-
 src/libsync/owncloudpropagator.h     |  4 ++--
 src/libsync/theme.cpp                |  4 ++++
 src/libsync/theme.h                  |  8 ++++++++
 10 files changed, 66 insertions(+), 25 deletions(-)


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