[Pkg-owncloud-commits] [owncloud-client] 04/120: Merge branch '2.0'

[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 68cff5cd102254d14972a9e37b8c1b18a426c315
Merge: ee75d37 b906c70
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Aug 7 11:31:44 2015 +0200

    Merge branch '2.0'

 ChangeLog                            |  4 ++--
 VERSION.cmake                        |  2 +-
 cmake/modules/NSIS.template.in       |  2 +-
 csync/src/vio/csync_vio_local_unix.c |  2 +-
 src/gui/application.cpp              | 18 ++----------------
 src/gui/application.h                |  1 -
 src/gui/folderstatusmodel.cpp        |  9 +++++++++
 src/gui/updater/ocupdater.cpp        | 18 ++++++++++++++++++
 src/gui/updater/ocupdater.h          |  4 ++++
 src/libsync/owncloudpropagator.cpp   |  2 +-
 src/libsync/ownsql.cpp               |  2 +-
 11 files changed, 40 insertions(+), 24 deletions(-)

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