[Pkg-owncloud-commits] [owncloud-client] 266/470: Merge branch '2.1'

[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 3334067d9f543e79bbfd0463ca4ec0466138d22a
Merge: 73e2a50 434d169
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Apr 4 16:58:49 2016 +0200

    Merge branch '2.1'
    
     Conflicts:
    	src/gui/socketapi.cpp

 .gitmodules                         |  2 +-
 doc/autoupdate.rst                  | 10 ++++++-
 doc/building.rst                    | 57 ++++++++++++++++++++++++++-----------
 src/libsync/propagateremotemove.cpp |  4 +++
 src/libsync/syncengine.cpp          | 14 ++++++++-
 src/libsync/utility.cpp             |  2 +-
 6 files changed, 69 insertions(+), 20 deletions(-)


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