[Pkg-owncloud-commits] [owncloud-client] 20/498: Merge remote-tracking branch 'origin/1.8'

[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 dfd9d8725c9388c79b8f97465672f83e10aae7dc
Merge: d55d8c0 2578832
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Fri Mar 27 11:19:59 2015 +0100

    Merge remote-tracking branch 'origin/1.8'
    
    Conflicts:
    	doc/installing.rst

 admin/win/docker/build.sh             |   19 +
 admin/win/download_runtimes.sh        |    2 +-
 src/gui/accountstate.cpp              |    4 +-
 src/gui/application.cpp               |    8 +-
 src/gui/folderman.cpp                 |    7 +
 src/gui/folderwizard.cpp              |    8 +
 src/gui/owncloudsetupwizard.cpp       |    3 +
 src/gui/protocolwidget.cpp            |   20 +-
 src/gui/protocolwidget.h              |    6 +-
 src/gui/sharedialog.cpp               |    8 +-
 src/gui/sslbutton.cpp                 |   48 +-
 src/gui/sslbutton.h                   |    5 +-
 src/libsync/account.cpp               |   13 +-
 src/libsync/account.h                 |    1 -
 src/libsync/clientproxy.cpp           |   55 +-
 src/libsync/clientproxy.h             |   20 +-
 src/libsync/configfile.cpp            |   10 +-
 src/libsync/configfile.h              |    2 +-
 src/libsync/connectionvalidator.cpp   |   35 +
 src/libsync/connectionvalidator.h     |    5 +
 src/libsync/cookiejar.cpp             |    1 -
 src/libsync/cookiejar.h               |    3 +-
 src/libsync/creds/httpcredentials.cpp |   13 +-
 src/libsync/creds/httpcredentials.h   |    1 +
 src/libsync/networkjobs.cpp           |   13 +-
 src/libsync/owncloudpropagator.cpp    |    7 +
 src/libsync/owncloudpropagator.h      |    4 +
 src/libsync/propagateupload.cpp       |    6 +
 src/libsync/propagateupload.h         |    1 +
 src/libsync/syncengine.cpp            |    8 +-
 src/libsync/theme.cpp                 |   18 +-
 src/libsync/theme.h                   |    2 +-
 translations/mirall_en.ts             | 3006 +++++++++++++++++++++++++++++++++
 33 files changed, 3297 insertions(+), 65 deletions(-)


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