[Pkg-owncloud-commits] [owncloud-client] 18/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 9d7cf6b8529769796aafc5992c91ef36a7d14d84
Merge: 1d31008 ad5620e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Mar 23 14:37:16 2015 +0100

    Merge remote-tracking branch 'origin/1.8'

 VERSION.cmake                                      |    2 +-
 admin/osx/pre_install.sh.cmake                     |    1 +
 admin/win/nsi/l10n/Catalan.nsh                     |    4 +-
 binary                                             |    2 +-
 shell_integration/nautilus/syncstate.py            |    6 +-
 .../windows/OCContextMenu/OCContextMenu.vcxproj    |    4 +-
 .../windows/OCOverlays/OCOverlays.vcxproj          |    2 +
 shell_integration/windows/OCUtil/OCUtil.vcxproj    |    2 +
 src/gui/accountstate.cpp                           |    9 +
 src/gui/folderwizard.cpp                           |  118 +-
 src/gui/folderwizard.h                             |    6 +
 src/gui/folderwizardtargetpage.ui                  |    7 +-
 src/gui/socketapi.cpp                              |   18 +-
 src/gui/socketapi.h                                |    1 +
 src/libsync/account.cpp                            |   15 +
 src/libsync/account.h                              |    1 +
 src/libsync/cookiejar.cpp                          |    2 +-
 src/libsync/propagatedownload.cpp                  |   12 +
 src/libsync/propagatedownload.h                    |    2 +
 src/libsync/propagateremotedelete.cpp              |   11 +-
 src/libsync/propagateupload.cpp                    |    1 +
 translations/client_el.ts                          |    6 +-
 translations/client_fr.ts                          |    6 +-
 translations/client_gl.ts                          |    2 +-
 translations/client_ja.ts                          |    4 +-
 translations/client_uk.ts                          |   92 +-
 translations/mirall_en.ts                          | 3006 --------------------
 27 files changed, 246 insertions(+), 3096 deletions(-)

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