[Pkg-owncloud-commits] [owncloud-client] 02/70: Merge pull request #1 from owncloud/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 738f026c41315610999716fe013868da34503df7
Merge: 32e205f fa715ce
Author: Tom Swartz <tom at tswartz.net>
Date:   Mon Nov 25 12:29:22 2013 -0800

    Merge pull request #1 from owncloud/master
    
    Merge with owncloud:master

 cmake/modules/NSIS.template.in               |   15 +-
 doc/building.rst                             |    7 +-
 src/CMakeLists.txt                           |    3 +-
 src/creds/abstractcredentials.h              |   29 +-
 src/creds/dummycredentials.cpp               |   12 +
 src/creds/dummycredentials.h                 |   23 +-
 src/creds/httpcredentials.cpp                |   57 ++
 src/creds/httpcredentials.h                  |   46 +-
 src/creds/shibboleth/shibbolethrefresher.cpp |    7 +-
 src/creds/shibboleth/shibbolethrefresher.h   |    4 +-
 src/creds/shibbolethcredentials.cpp          |   29 +-
 src/creds/shibbolethcredentials.h            |    5 +-
 src/mirall/account.cpp                       |   18 +-
 src/mirall/account.h                         |   13 +-
 src/mirall/accountsettings.cpp               |   57 +-
 src/mirall/accountsettings.h                 |    4 +-
 src/mirall/application.cpp                   |   40 +
 src/mirall/application.h                     |    4 +
 src/mirall/connectionvalidator.cpp           |   28 +-
 src/mirall/csyncthread.cpp                   |   57 +-
 src/mirall/csyncthread.h                     |    6 +-
 src/mirall/folder.cpp                        |   40 +-
 src/mirall/folder.h                          |    1 +
 src/mirall/networkjobs.cpp                   |   72 +-
 src/mirall/networkjobs.h                     |   25 +-
 src/mirall/owncloudgui.cpp                   |   53 +-
 src/mirall/owncloudgui.h                     |    4 +
 src/mirall/owncloudpropagator.cpp            |  153 +++-
 src/mirall/owncloudpropagator.h              |    9 +-
 src/mirall/owncloudsetupwizard.cpp           |   11 +-
 src/mirall/owncloudsetupwizard.h             |    4 +-
 src/mirall/progressdispatcher.cpp            |   99 +--
 src/mirall/progressdispatcher.h              |   13 +-
 src/mirall/protocolwidget.cpp                |   19 +-
 src/mirall/quotainfo.cpp                     |   14 +-
 src/mirall/quotainfo.h                       |    1 +
 src/mirall/settingsdialog.cpp                |    9 +-
 src/mirall/settingsdialog.h                  |    3 +
 src/mirall/syncjournaldb.cpp                 |  157 ++--
 src/mirall/syncjournaldb.h                   |   11 +-
 src/mirall/systray.cpp                       |    6 +
 src/mirall/systray.h                         |    2 +-
 translations/mirall_ca.ts                    | 1077 +++++++++++++-------------
 translations/mirall_cs.ts                    |  702 ++++++++---------
 translations/mirall_de.ts                    |  711 ++++++++---------
 translations/mirall_el.ts                    |  682 ++++++++--------
 translations/mirall_en.ts                    |  675 ++++++++--------
 translations/mirall_es.ts                    |  714 ++++++++---------
 translations/mirall_es_AR.ts                 |  732 +++++++++--------
 translations/mirall_et.ts                    |  725 +++++++++--------
 translations/mirall_eu.ts                    |  680 ++++++++--------
 translations/mirall_fa.ts                    |  678 ++++++++--------
 translations/mirall_fi.ts                    |  698 ++++++++---------
 translations/mirall_fr.ts                    |  706 ++++++++---------
 translations/mirall_gl.ts                    |  703 ++++++++---------
 translations/mirall_hu.ts                    |  672 ++++++++--------
 translations/mirall_it.ts                    |  702 ++++++++---------
 translations/mirall_ja.ts                    |  704 ++++++++---------
 translations/mirall_nl.ts                    |  702 ++++++++---------
 translations/mirall_pl.ts                    |  702 ++++++++---------
 translations/mirall_pt.ts                    |  708 ++++++++---------
 translations/mirall_pt_BR.ts                 |  703 ++++++++---------
 translations/mirall_ru.ts                    |  726 +++++++++--------
 translations/mirall_sk.ts                    |  871 ++++++++++-----------
 translations/mirall_sl.ts                    |  964 +++++++++++------------
 translations/mirall_sv.ts                    |  708 ++++++++---------
 translations/mirall_th.ts                    |  676 ++++++++--------
 translations/mirall_uk.ts                    |  680 ++++++++--------
 translations/mirall_zh_CN.ts                 |  682 ++++++++--------
 translations/mirall_zh_TW.ts                 |  700 ++++++++---------
 70 files changed, 10560 insertions(+), 10993 deletions(-)

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