[Pkg-owncloud-commits] [owncloud-client] 27/498: Merge branch 'master' into new-ui

[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 2da3bfb96f2e1ac0860e28903c1956065627f5d2
Merge: afdd014 5dffd11
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Apr 16 12:50:21 2015 +0200

    Merge branch 'master' into new-ui

 VERSION.cmake                               |    4 +-
 admin/win/nsi/l10n/French.nsh               |    2 +-
 csync/src/csync.c                           |   10 +-
 csync/src/csync.h                           |    5 -
 csync/src/csync_private.h                   |   12 +-
 csync/src/csync_reconcile.c                 |    4 +-
 csync/src/csync_statedb.c                   |    8 +-
 csync/src/csync_update.c                    |    2 +-
 csync/src/vio/csync_vio_file_stat.c         |    6 +-
 issue_template.md                           |    2 +-
 src/cmd/cmd.cpp                             |    7 +-
 src/cmd/simplesslerrorhandler.cpp           |    3 +-
 src/cmd/simplesslerrorhandler.h             |    2 +-
 src/gui/CMakeLists.txt                      |    9 +
 src/gui/accountstate.cpp                    |    4 +-
 src/gui/owncloudsetupwizard.cpp             |   54 +-
 src/gui/owncloudsetupwizard.h               |    5 +-
 src/gui/protocolwidget.cpp                  |   15 +-
 src/gui/selectivesyncdialog.cpp             |   31 +-
 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/configfile.cpp                  |   16 +-
 src/libsync/connectionvalidator.cpp         |    9 +-
 src/libsync/creds/http/httpconfigfile.cpp   |   81 ---
 src/libsync/creds/http/httpconfigfile.h     |   44 --
 src/libsync/discoveryphase.cpp              |   43 +-
 src/libsync/discoveryphase.h                |   58 +-
 src/libsync/networkjobs.cpp                 |  250 ++++---
 src/libsync/networkjobs.h                   |   18 +
 src/libsync/owncloudpropagator.cpp          |    1 +
 src/libsync/owncloudpropagator_p.h          |   10 +-
 src/libsync/propagatedownload.cpp           |    8 +-
 src/libsync/propagateupload.cpp             |    5 +-
 src/libsync/propagator_legacy.cpp           |    3 +-
 src/libsync/syncengine.cpp                  |   18 +-
 src/libsync/syncengine.h                    |   14 +
 src/libsync/syncjournaldb.cpp               |   15 +-
 src/libsync/syncjournaldb.h                 |    3 +-
 src/libsync/theme.h                         |    4 +
 test/CMakeLists.txt                         |    2 +-
 test/testxmlparse.h                         |  245 +++++++
 translations/.tx/config                     |    1 +
 translations/client_el.ts                   |   72 +-
 translations/client_fr.ts                   |   70 +-
 translations/client_ja.ts                   |    8 +-
 translations/client_pl.ts                   |   18 +-
 translations/client_sl.ts                   |    8 +-
 translations/{client_sl.ts => client_sr.ts} | 1036 ++++++++++++++-------------
 translations/client_sv.ts                   |    8 +-
 translations/mirall_en.ts                   |  305 ++++----
 60 files changed, 1680 insertions(+), 1272 deletions(-)

diff --cc src/gui/sharedialog.cpp
index f190980,f13722d..cdf9049
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@@ -19,9 -19,9 +19,10 @@@
  #include "json.h"
  #include "folderman.h"
  #include "folder.h"
 +#include "accountmanager.h"
  #include "theme.h"
  #include "syncresult.h"
+ #include "configfile.h"
  
  #include "QProgressIndicator.h"
  #include <QBuffer>

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