[Pkg-owncloud-commits] [owncloud-client] 84/89: Merge tag 'upstream/1.5.0+dfsg'

[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 87f0fcd5006afb5345ca4be686e511a797709e65
Merge: f219b31 7e871d5
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Dec 13 15:34:31 2013 +0100

    Merge tag 'upstream/1.5.0+dfsg'
    
    Upstream version 1.5.0+dfsg
    
    # gpg: Unterschrift vom Fr 13 Dez 2013 15:34:30 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                     |   2 +-
 ChangeLog                                |  47 +++++
 OwnCloudCPack.cmake                      |   9 +-
 VERSION.cmake                            |  30 +++-
 cmake/modules/FindNeon.cmake             |   2 +-
 cmake/modules/MacOSXBundleInfo.plist.in  |   6 +-
 cmake/modules/NSIS.template.in           | 169 +++++++++++++-----
 config.h.in                              |   2 +
 doc/architecture.rst                     |  40 ++++-
 doc/conf.py.in                           |   2 +
 doc/owncloud.1.rst                       |   7 +-
 doc/owncloudcmd.1.rst                    |  34 ++++
 doc/visualtour.rst                       |  56 +++---
 src/CMakeLists.txt                       |  39 +++-
 src/creds/httpcredentials.cpp            |   2 +-
 src/main.cpp                             |   1 -
 src/mirall/account.cpp                   |   7 +-
 src/mirall/accountsettings.cpp           |  50 +-----
 src/mirall/application.cpp               |   8 +-
 src/mirall/csyncthread.cpp               |  51 ++++--
 src/mirall/folder.cpp                    |   6 +-
 src/mirall/folderman.cpp                 |   3 +-
 src/mirall/folderwatcher_inotify.cpp     |   1 +
 src/mirall/folderwizard.cpp              |   4 +-
 src/mirall/logger.cpp                    |   2 +-
 src/mirall/mirallconfigfile.cpp          |  23 +++
 src/mirall/mirallconfigfile.h            |   3 +
 src/mirall/owncloudgui.cpp               |   2 +-
 src/mirall/owncloudpropagator.cpp        |  62 +++++--
 src/mirall/owncloudsetupwizard.cpp       |   5 +-
 src/mirall/owncloudtheme.cpp             |   2 +-
 src/mirall/progressdispatcher.cpp        |   8 +-
 src/mirall/progressdispatcher.h          |   4 +-
 src/mirall/protocolwidget.cpp            |  30 +++-
 src/mirall/protocolwidget.h              |   2 +-
 src/mirall/quotainfo.cpp                 |   8 +-
 src/mirall/quotainfo.h                   |   1 +
 src/mirall/settingsdialog.cpp            |   2 +-
 src/mirall/syncfileitem.h                |   9 +-
 src/mirall/syncjournaldb.cpp             |  34 ++--
 src/mirall/syncjournalfilerecord.cpp     |   2 +-
 src/mirall/theme.cpp                     |   5 +
 src/mirall/theme.h                       |   5 +
 src/mirall/updatedetector.cpp            |  12 +-
 src/mirall/utility.cpp                   |  25 ++-
 src/mirall/utility.h                     |   1 +
 src/mirall/version.h.in                  |  20 +--
 src/owncloudcmd/owncloudcmd.cpp          |   2 +-
 src/wizard/owncloudadvancedsetuppage.cpp |   1 +
 src/wizard/owncloudadvancedsetuppage.ui  |  24 +--
 src/wizard/owncloudsetuppage.cpp         |  16 +-
 translations/mirall_ca.ts                | 260 ++++++++++++---------------
 translations/mirall_cs.ts                | 265 +++++++++++++--------------
 translations/mirall_de.ts                | 265 +++++++++++++--------------
 translations/mirall_el.ts                | 260 ++++++++++++---------------
 translations/mirall_en.ts                | 258 ++++++++++++---------------
 translations/mirall_es.ts                | 275 +++++++++++++---------------
 translations/mirall_es_AR.ts             | 262 ++++++++++++---------------
 translations/mirall_et.ts                | 290 ++++++++++++++----------------
 translations/mirall_eu.ts                | 260 ++++++++++++---------------
 translations/mirall_fa.ts                | 258 ++++++++++++---------------
 translations/mirall_fi.ts                | 262 ++++++++++++---------------
 translations/mirall_fr.ts                | 264 ++++++++++++---------------
 translations/mirall_gl.ts                | 265 +++++++++++++--------------
 translations/mirall_hu.ts                | 260 ++++++++++++---------------
 translations/mirall_it.ts                | 297 ++++++++++++++-----------------
 translations/mirall_ja.ts                | 275 +++++++++++++---------------
 translations/mirall_nl.ts                | 265 +++++++++++++--------------
 translations/mirall_pl.ts                | 260 ++++++++++++---------------
 translations/mirall_pt.ts                | 258 ++++++++++++---------------
 translations/mirall_pt_BR.ts             | 265 +++++++++++++--------------
 translations/mirall_ru.ts                | 262 ++++++++++++---------------
 translations/mirall_sk.ts                | 266 +++++++++++++--------------
 translations/mirall_sl.ts                | 268 +++++++++++++---------------
 translations/mirall_sv.ts                | 260 ++++++++++++---------------
 translations/mirall_th.ts                | 258 ++++++++++++---------------
 translations/mirall_uk.ts                | 258 ++++++++++++---------------
 translations/mirall_zh_CN.ts             | 258 ++++++++++++---------------
 translations/mirall_zh_TW.ts             | 258 ++++++++++++---------------
 79 files changed, 3914 insertions(+), 4386 deletions(-)

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