[Pkg-owncloud-commits] [owncloud-client] 06/498: Merge branch '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 ae57bf28c6dc7b4484c9897262a88ac6e419d3c0
Merge: 6375d0b 1929040
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Tue Feb 24 22:02:44 2015 +0100

    Merge branch '1.8'

 CMakeLists.txt                                |   5 +
 admin/win/nsi/l10n/SimpChinese.nsh            |   4 +-
 admin/win/nsi/l10n/Slovenian.nsh              |   4 +-
 admin/win/nsi/l10n/Spanish.nsh                |   6 +-
 cmake/modules/GetGitRevisionDescription.cmake |   9 +-
 src/gui/application.cpp                       |  19 +-
 src/gui/application.h                         |   2 +-
 src/gui/main.cpp                              |  10 +-
 src/libsync/logger.cpp                        |   6 +
 src/libsync/syncengine.cpp                    |   4 +
 src/libsync/syncfileitem.h                    |   2 +-
 translations/client_es.ts                     |  39 ++--
 translations/client_es_AR.ts                  |   2 +-
 translations/client_ja.ts                     |   6 +-
 translations/client_nl.ts                     |  10 +-
 translations/client_ru.ts                     |   4 +-
 translations/client_sl.ts                     |  20 +-
 translations/client_tr.ts                     |   4 +-
 translations/client_zh_CN.ts                  | 253 +++++++++++++-------------
 translations/mirall_en.ts                     |  62 +++----
 20 files changed, 244 insertions(+), 227 deletions(-)

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