[Pkg-owncloud-commits] [owncloud-client] 265/484: Merge remote-tracking branch 'upstream/master'

[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 572d9bdf1af5fc95b10eb82e1f925fb97f971f71
Merge: 0bcb13f dae724b
Author: Niels van Adrichem <n.l.m.vanadrichem at tudelft.nl>
Date:   Thu Nov 5 14:42:26 2015 +0100

    Merge remote-tracking branch 'upstream/master'
    
    Conflicts:
    	src/gui/share.h

 README.md                                |   2 +-
 cmake/modules/QtVersionAbstraction.cmake |   4 +-
 doc/autoupdate.rst                       |   2 +-
 src/gui/share.h                          |   2 +-
 sync-exclude.lst                         |   1 +
 translations/client_ca.ts                | 740 ++++++++++++++--------------
 translations/client_cs.ts                | 740 ++++++++++++++--------------
 translations/client_de.ts                | 742 ++++++++++++++--------------
 translations/client_el.ts                | 742 ++++++++++++++--------------
 translations/client_en.ts                | 718 +++++++++++++--------------
 translations/client_es.ts                | 744 ++++++++++++++--------------
 translations/client_es_AR.ts             | 726 ++++++++++++++--------------
 translations/client_et.ts                | 736 ++++++++++++++--------------
 translations/client_eu.ts                | 724 ++++++++++++++--------------
 translations/client_fa.ts                | 728 ++++++++++++++--------------
 translations/client_fi.ts                | 738 ++++++++++++++--------------
 translations/client_fr.ts                | 742 ++++++++++++++--------------
 translations/client_gl.ts                | 738 ++++++++++++++--------------
 translations/client_hu.ts                | 730 ++++++++++++++--------------
 translations/client_it.ts                | 742 ++++++++++++++--------------
 translations/client_ja.ts                | 758 ++++++++++++++---------------
 translations/client_nb_NO.ts             | 742 ++++++++++++++--------------
 translations/client_nl.ts                | 742 ++++++++++++++--------------
 translations/client_pl.ts                | 738 ++++++++++++++--------------
 translations/client_pt.ts                | 744 ++++++++++++++--------------
 translations/client_pt_BR.ts             | 744 ++++++++++++++--------------
 translations/client_ru.ts                | 742 ++++++++++++++--------------
 translations/client_sk.ts                | 740 ++++++++++++++--------------
 translations/client_sl.ts                | 738 ++++++++++++++--------------
 translations/client_sr.ts                | 738 ++++++++++++++--------------
 translations/client_sv.ts                | 736 ++++++++++++++--------------
 translations/client_th.ts                | 742 ++++++++++++++--------------
 translations/client_tr.ts                | 740 ++++++++++++++--------------
 translations/client_uk.ts                | 736 ++++++++++++++--------------
 translations/client_zh_CN.ts             | 742 ++++++++++++++--------------
 translations/client_zh_TW.ts             | 798 +++++++++++++++----------------
 36 files changed, 10986 insertions(+), 11975 deletions(-)

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