[Pkg-owncloud-commits] [owncloud-client] 26/498: Merge branch '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 5dffd11755e24338c8f62ae3a70ef05bed287f99
Merge: f3cb5f8 8bb4af0
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Apr 16 12:49:31 2015 +0200

    Merge branch '1.8'

 VERSION.cmake                               |    4 +-
 binary                                      |    2 +-
 csync/src/csync_reconcile.c                 |    4 +-
 csync/src/vio/csync_vio_file_stat.c         |    2 +
 src/cmd/cmd.cpp                             |    4 +-
 src/gui/owncloudsetupwizard.cpp             |   54 +-
 src/gui/owncloudsetupwizard.h               |    5 +-
 src/gui/protocolwidget.cpp                  |    4 +-
 src/gui/selectivesyncdialog.cpp             |   31 +-
 src/libsync/configfile.cpp                  |   16 +-
 src/libsync/discoveryphase.cpp              |   11 +-
 src/libsync/discoveryphase.h                |    2 +-
 src/libsync/networkjobs.cpp                 |  247 ++++---
 src/libsync/networkjobs.h                   |   18 +
 src/libsync/propagatedownload.cpp           |    7 +-
 src/libsync/propagator_legacy.cpp           |    3 +-
 src/libsync/syncengine.cpp                  |    2 +-
 test/CMakeLists.txt                         |    2 +-
 test/testxmlparse.h                         |  245 +++++++
 translations/.tx/config                     |    1 +
 translations/client_el.ts                   |    4 +-
 translations/client_fr.ts                   |   46 +-
 translations/client_ja.ts                   |    8 +-
 translations/client_pl.ts                   |   18 +-
 translations/{client_ja.ts => client_sr.ts} | 1028 ++++++++++++++-------------
 translations/client_sv.ts                   |    8 +-
 translations/mirall_en.ts                   |   78 +-
 27 files changed, 1126 insertions(+), 728 deletions(-)

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