[Pkg-owncloud-commits] [owncloud-client] 86/103: Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'

[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 9f0848ba1556ec59d6758c118d9d4705e709f72b
Merge: f159b02 4489a56
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Apr 29 12:23:15 2014 +0200

    Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'

 cmake/modules/FindNeon.cmake             |  2 +-
 cmake/modules/FindSQLite3.cmake          |  2 +-
 cmake/modules/QtVersionAbstraction.cmake | 26 ++++++-----
 csync/src/csync.h                        |  3 +-
 csync/src/csync_exclude.c                | 14 ++++++
 csync/src/csync_reconcile.c              | 10 +++++
 csync/src/csync_util.c                   | 13 ++++++
 csync/src/csync_util.h                   |  1 +
 src/CMakeLists.txt                       | 76 +++++++++++++++++---------------
 src/creds/abstractcredentials.h          |  4 +-
 src/creds/httpcredentials.h              |  2 +-
 src/creds/tokencredentials.cpp           | 19 +++-----
 src/creds/tokencredentials.h             |  2 +-
 src/mirall/account.h                     |  5 ++-
 src/mirall/clientproxy.h                 |  3 +-
 src/mirall/folder.cpp                    |  5 +++
 src/mirall/folderman.cpp                 |  8 +++-
 src/mirall/logger.h                      |  4 +-
 src/mirall/mirallconfigfile.cpp          | 13 +++++-
 src/mirall/owncloudtheme.cpp             |  9 +++-
 src/mirall/propagator_legacy.cpp         | 12 ++---
 src/mirall/propagator_qnam.cpp           | 47 +++++++++++++++-----
 src/mirall/propagator_qnam.h             |  6 ++-
 src/mirall/syncengine.cpp                |  5 ++-
 src/mirall/syncengine.h                  |  4 +-
 src/mirall/syncjournaldb.h               |  4 +-
 src/mirall/theme.cpp                     |  7 +++
 src/mirall/theme.h                       |  4 ++
 src/mirall/utility.cpp                   | 13 +++++-
 src/mirall/utility.h                     |  6 +++
 30 files changed, 229 insertions(+), 100 deletions(-)


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