[Pkg-owncloud-commits] [owncloud-client] 102/103: Merge tag 'upstream/1.6.0_beta2+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Apr 30 18:09:04 UTC 2014
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 1f2eceb0cf3d9323d1b3b6986da29f9e47991fe5
Merge: 1458949 02e0a41
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Wed Apr 30 19:47:39 2014 +0200
Merge tag 'upstream/1.6.0_beta2+dfsg'
Upstream version 1.6.0~beta2+dfsg
# gpg: Unterschrift vom Mi 30 Apr 2014 19:47:30 CEST mittels RSA-Schlüssel ID 50605636
# gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
.tag | 2 +-
CMakeLists.txt | 8 +
ChangeLog | 12 +
VERSION.cmake | 2 +-
cmake/modules/FindNeon.cmake | 2 +-
cmake/modules/FindSQLite3.cmake | 2 +-
cmake/modules/GNUInstallDirs.cmake | 157 ++++--
cmake/modules/QtVersionAbstraction.cmake | 26 +-
csync/src/CMakeLists.txt | 33 +-
csync/src/csync.c | 13 +-
csync/src/csync.h | 13 +-
csync/src/csync_exclude.c | 14 +
csync/src/csync_private.h | 1 +
csync/src/csync_reconcile.c | 13 +-
csync/src/csync_update.c | 41 +-
csync/src/csync_util.c | 20 +-
csync/src/csync_util.h | 1 +
csync/tests/csync_tests/check_csync_update.c | 7 -
csync/tests/ownCloud/t1.pl | 45 +-
csync/tests/ownCloud/t2.pl | 19 +-
csync/tests/ownCloud/toremote1/My Document.doc | 1 +
csync/tests/ownCloud/toremote1/kernelcrash.txt | 16 +
csync/tests/ownCloud/toremote1/kraft_logo.gif | Bin 0 -> 7080 bytes
csync/tests/ownCloud/toremote1/rtl2/mettre.xls | 1 -
doc/visualtour.rst | 2 +-
src/CMakeLists.txt | 87 +--
src/creds/abstractcredentials.h | 4 +-
src/creds/credentialsfactory.cpp | 1 +
src/creds/credentialsfactory.h | 6 +-
src/creds/httpcredentials.h | 2 +-
src/creds/shibboleth/shibbolethuserjob.cpp | 5 +-
src/creds/shibboleth/shibbolethuserjob.h | 2 +-
src/creds/shibboleth/shibbolethwebview.h | 3 +-
src/creds/shibbolethcredentials.h | 2 +-
src/creds/tokencredentials.cpp | 19 +-
src/creds/tokencredentials.h | 2 +-
src/mirall/account.h | 5 +-
src/mirall/accountsettings.cpp | 5 +
src/mirall/application.cpp | 11 +-
src/mirall/application.h | 3 +
src/mirall/clientproxy.h | 3 +-
src/mirall/connectionvalidator.h | 3 +-
src/mirall/folder.cpp | 9 +-
src/mirall/folder.h | 6 +-
src/mirall/folderman.cpp | 14 +-
src/mirall/folderman.h | 2 +-
src/mirall/folderwatcher_linux.cpp | 2 +-
src/mirall/logger.h | 4 +-
src/mirall/mirallaccessmanager.cpp | 2 +-
src/mirall/mirallaccessmanager.h | 3 +-
src/mirall/mirallconfigfile.cpp | 13 +-
src/mirall/mirallconfigfile.h | 3 +-
src/mirall/networkjobs.cpp | 49 +-
src/mirall/networkjobs.h | 30 +-
src/mirall/owncloudgui.cpp | 8 +
.../credentialsfactory.h => mirall/owncloudlib.h} | 24 +-
src/mirall/owncloudpropagator.cpp | 7 +-
src/mirall/owncloudsetupwizard.cpp | 13 +-
src/mirall/owncloudsetupwizard.h | 4 +-
src/mirall/owncloudtheme.cpp | 11 +-
src/mirall/progressdispatcher.cpp | 52 +-
src/mirall/progressdispatcher.h | 9 +-
src/mirall/propagator_legacy.cpp | 12 +-
src/mirall/propagator_qnam.cpp | 73 ++-
src/mirall/propagator_qnam.h | 14 +-
src/mirall/propagatorjobs.cpp | 11 +-
src/mirall/propagatorjobs.h | 9 +
src/mirall/quotainfo.cpp | 2 -
src/mirall/sslbutton.cpp | 33 +-
src/mirall/syncengine.cpp | 27 +-
src/mirall/syncengine.h | 4 +-
src/mirall/syncfileitem.h | 3 +-
src/mirall/syncjournaldb.cpp | 40 +-
src/mirall/syncjournaldb.h | 11 +-
src/mirall/syncresult.h | 3 +-
src/mirall/syncrunfilelog.cpp | 6 -
src/mirall/theme.cpp | 9 +-
src/mirall/theme.h | 6 +-
src/mirall/utility.cpp | 31 +-
src/mirall/utility.h | 48 +-
src/mirall/utility_unix.cpp | 19 +-
src/owncloudcmd/owncloudcmd.cpp | 2 +-
translations/mirall_ca.ts | 525 +++++++++---------
translations/mirall_cs.ts | 462 ++++++++--------
translations/mirall_de.ts | 460 ++++++++--------
translations/mirall_el.ts | 464 ++++++++--------
translations/mirall_en.ts | 454 ++++++++--------
translations/mirall_es.ts | 462 ++++++++--------
translations/mirall_es_AR.ts | 458 ++++++++--------
translations/mirall_et.ts | 460 ++++++++--------
translations/mirall_eu.ts | 458 ++++++++--------
translations/mirall_fa.ts | 456 ++++++++--------
translations/mirall_fi.ts | 482 ++++++++--------
translations/mirall_fr.ts | 470 ++++++++--------
translations/mirall_gl.ts | 462 ++++++++--------
translations/mirall_hu.ts | 458 ++++++++--------
translations/mirall_it.ts | 460 ++++++++--------
translations/mirall_ja.ts | 458 ++++++++--------
translations/mirall_nl.ts | 462 ++++++++--------
translations/mirall_pl.ts | 462 ++++++++--------
translations/mirall_pt.ts | 460 ++++++++--------
translations/mirall_pt_BR.ts | 466 ++++++++--------
translations/mirall_ru.ts | 458 ++++++++--------
translations/mirall_sk.ts | 603 +++++++++++----------
translations/mirall_sl.ts | 462 ++++++++--------
translations/mirall_sv.ts | 470 ++++++++--------
translations/mirall_th.ts | 456 ++++++++--------
translations/mirall_tr.ts | 530 +++++++++---------
translations/mirall_uk.ts | 456 ++++++++--------
translations/mirall_zh_CN.ts | 456 ++++++++--------
translations/mirall_zh_TW.ts | 456 ++++++++--------
111 files changed, 7995 insertions(+), 6893 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list