[Pkg-owncloud-commits] [owncloud-client] 150/498: Merge remote-tracking branch 'origin/master' into new-ui

[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 bea8896012b279e83699d715be14ce4d913a9d99
Merge: 81c10da 1dabdc7
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Sun Jun 14 10:39:30 2015 +0200

    Merge remote-tracking branch 'origin/master' into new-ui

 .travis.yml                  | 31 +++++++++++++++++++++++++++++++
 src/gui/socketapi.cpp        |  2 +-
 src/libsync/discoveryphase.h | 10 +++++-----
 src/libsync/syncengine.cpp   |  1 +
 src/libsync/syncengine.h     |  2 +-
 5 files changed, 39 insertions(+), 7 deletions(-)


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