[Pkg-owncloud-commits] [owncloud-client] 11/484: 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 3ba5e27d02cfdd4850c83d99f670138bc2607f72
Merge: 950bc57 0fa4353
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Sep 1 17:57:56 2015 +0200

    Merge branch '2.0'

 VERSION.cmake                 |   2 +-
 csync/src/csync_exclude.c     |  12 +--
 doc/building.rst              |  20 ++---
 mirall.desktop.in             |   1 +
 src/gui/CMakeLists.txt        |   1 -
 src/gui/accountmigrator.cpp   |  89 ---------------------
 src/gui/accountmigrator.h     |  39 ---------
 src/gui/accountsettings.cpp   |  16 ++--
 src/gui/accountsettings.h     |   1 -
 src/gui/accountsettings.ui    | 181 ++++++++++++++++++------------------------
 src/gui/folder.cpp            |   8 +-
 src/gui/folderman.cpp         |   1 -
 src/gui/folderstatusmodel.cpp |   5 +-
 src/gui/settingsdialog.cpp    |   3 -
 src/gui/settingsdialog.ui     |  26 +-----
 15 files changed, 118 insertions(+), 287 deletions(-)


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