[Pkg-owncloud-commits] [owncloud-client] 187/219: Merge branch 'socketapi_localsocket' into 1.7

[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 147fa60f81208bcf9a737f2ba25a870e1ac6bada
Merge: db02d44 a1b9405
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Oct 1 12:34:22 2014 +0200

    Merge branch 'socketapi_localsocket' into 1.7

 .../MacOSX/OwnCloudFinder/GCDAsyncSocket.h         |  297 +-
 .../MacOSX/OwnCloudFinder/GCDAsyncSocket.m         | 3157 +++++++++++++-------
 .../MacOSX/OwnCloudFinder/RequestManager.m         |   37 +-
 shell_integration/nautilus/syncstate.py            |   77 +-
 src/mirall/folderman.cpp                           |   10 +-
 src/mirall/protocolwidget.cpp                      |    2 +-
 src/mirall/socketapi.cpp                           |   81 +-
 src/mirall/socketapi.h                             |   31 +-
 src/mirall/syncengine.cpp                          |    2 +-
 9 files changed, 2459 insertions(+), 1235 deletions(-)

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