[Pkg-owncloud-commits] [owncloud-client] 24/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 f3cb5f8a9d446fe5ee1c63e74c52787a342f5b8f
Merge: 71e8910 c805c5d
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Apr 9 14:24:26 2015 +0200

    Merge remote-tracking branch 'origin/1.8'

 admin/win/nsi/l10n/French.nsh             |   2 +-
 binary                                    |   2 +-
 csync/src/csync.c                         |  10 +-
 csync/src/csync.h                         |   5 -
 csync/src/csync_private.h                 |  12 +-
 csync/src/csync_statedb.c                 |   8 +-
 csync/src/csync_update.c                  |   2 +-
 csync/src/vio/csync_vio_file_stat.c       |   4 +-
 src/cmd/cmd.cpp                           |   3 +
 src/cmd/simplesslerrorhandler.cpp         |   3 +-
 src/cmd/simplesslerrorhandler.h           |   2 +-
 src/gui/CMakeLists.txt                    |   9 ++
 src/gui/accountstate.cpp                  |   4 +-
 src/gui/protocolwidget.cpp                |  15 +-
 src/gui/sharedialog.cpp                   |  75 +++++++---
 src/gui/sharedialog.h                     |   4 +
 src/gui/sharedialog.ui                    | 217 +++++++++++++++-------------
 src/gui/socketapi.cpp                     |  36 +++--
 src/gui/socketapi.h                       |  20 +--
 src/gui/sslerrordialog.cpp                |   3 +-
 src/gui/sslerrordialog.h                  |   2 +-
 src/gui/updater/ocupdater.cpp             |   7 +-
 src/gui/version.rc.in                     |  25 ++++
 src/libsync/CMakeLists.txt                |   1 -
 src/libsync/account.cpp                   |   2 +-
 src/libsync/account.h                     |   2 +-
 src/libsync/connectionvalidator.cpp       |   9 +-
 src/libsync/creds/http/httpconfigfile.cpp |  81 -----------
 src/libsync/creds/http/httpconfigfile.h   |  44 ------
 src/libsync/discoveryphase.cpp            |  32 ++---
 src/libsync/discoveryphase.h              |  58 ++++----
 src/libsync/networkjobs.cpp               |   3 +-
 src/libsync/owncloudpropagator.cpp        |   1 +
 src/libsync/owncloudpropagator_p.h        |  10 +-
 src/libsync/propagatedownload.cpp         |   1 +
 src/libsync/propagateupload.cpp           |   5 +-
 src/libsync/syncengine.cpp                |  16 ++-
 src/libsync/syncengine.h                  |  14 ++
 src/libsync/syncjournaldb.cpp             |  15 +-
 src/libsync/syncjournaldb.h               |   3 +-
 src/libsync/theme.h                       |   4 +
 translations/client_el.ts                 |  68 +++++----
 translations/client_fr.ts                 |  24 ++--
 translations/client_sl.ts                 |   8 +-
 translations/mirall_en.ts                 | 229 ++++++++++++++----------------
 45 files changed, 555 insertions(+), 545 deletions(-)


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