[Pkg-owncloud-commits] [owncloud-client] 120/332: Merge branch 'il'

[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 b626589c079b321892da4a2178345a41274355a9
Merge: 4555d4b 02704cd
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jun 23 12:52:03 2014 +0200

    Merge branch 'il'
    
    Conflicts:
    	src/mirall/folderstatusmodel.h

 ChangeLog                                     |  21 +++
 cmake/modules/NSIS.template.in                |   4 +-
 csync/src/csync.c                             |   5 -
 csync/src/csync_exclude.c                     |   4 +
 csync/src/csync_owncloud.c                    |   2 +-
 csync/src/csync_owncloud_recursive_propfind.c |   7 +-
 csync/src/csync_reconcile.c                   |   4 +-
 csync/src/csync_statedb.c                     |   6 +-
 csync/src/csync_update.c                      |   5 +-
 csync/src/csync_util.c                        |  12 +-
 csync/src/httpbf/src/httpbf.c                 |   4 +-
 csync/src/std/c_time.c                        |   3 +-
 csync/src/vio/csync_vio_local.c               |   1 +
 csync/tests/csync_tests/check_csync_create.c  |   1 -
 src/3rdparty/fancylineedit/fancylineedit.cpp  |   2 +-
 src/creds/shibboleth/shibbolethwebview.cpp    |  19 ---
 src/creds/shibboleth/shibbolethwebview.h      |   1 -
 src/creds/shibbolethcredentials.cpp           |  28 ++++
 src/creds/shibbolethcredentials.h             |   3 +
 src/creds/tokencredentials.cpp                |  37 ++---
 src/creds/tokencredentials.h                  |   3 +-
 src/mirall/accountsettings.cpp                |  28 +---
 src/mirall/accountsettings.h                  |   1 -
 src/mirall/folderstatusmodel.h                |   1 -
 src/mirall/folderwizard.cpp                   |   5 +-
 src/mirall/owncloudgui.cpp                    |   5 +-
 src/mirall/owncloudpropagator.cpp             |  10 +-
 src/mirall/owncloudpropagator.h               |  10 +-
 src/mirall/owncloudtheme.cpp                  |   3 +-
 src/mirall/propagator_legacy.cpp              |   5 +
 src/mirall/propagator_legacy.h                |   3 +-
 src/mirall/propagator_qnam.cpp                |   3 +-
 src/mirall/settingsdialogmac.cpp              |  12 ++
 src/mirall/syncengine.cpp                     | 214 ++++++++++++++++++++++++--
 src/mirall/syncengine.h                       |  13 +-
 src/mirall/syncfileitem.h                     |   8 +-
 src/mirall/syncjournaldb.cpp                  |   2 +-
 src/mirall/syncjournaldb.h                    |   4 +-
 src/mirall/theme.cpp                          |   8 +
 src/mirall/theme.h                            |   2 +-
 src/owncloudcmd/owncloudcmd.cpp               |   1 -
 src/wizard/owncloudsetuppage.cpp              |   2 +
 src/wizard/owncloudwizard.cpp                 |   1 +
 43 files changed, 383 insertions(+), 130 deletions(-)


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