[Pkg-owncloud-commits] [owncloud-client] 23/38: Merge remote-tracking branch 'origin/reuse_oc_config' into 1.6

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch sid
in repository owncloud-client.

commit c1faff513ea2b08fcd48791996a56c946b488703
Merge: e5b4438 e17243b
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Aug 29 20:07:27 2014 +0200

    Merge remote-tracking branch 'origin/reuse_oc_config' into 1.6

 src/CMakeLists.txt             |  1 +
 src/mirall/account.cpp         | 64 ++++++++++++++++++++++++++++--
 src/mirall/account.h           |  8 ++++
 src/mirall/accountmigrator.cpp | 89 ++++++++++++++++++++++++++++++++++++++++++
 src/mirall/accountmigrator.h   | 38 ++++++++++++++++++
 src/mirall/folderman.cpp       | 12 ++++++
 src/mirall/folderman.h         |  3 +-
 src/mirall/owncloudtheme.cpp   | 10 +++++
 src/mirall/owncloudtheme.h     |  3 ++
 9 files changed, 224 insertions(+), 4 deletions(-)


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