[Pkg-owncloud-commits] [owncloud-client] 221/498: Merge remote-tracking branch 'origin/maser'

[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 4a541a9ab445d5b6f09c2616ecd8b56851bd62a2
Merge: ec5894e ec3fc50
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jun 30 13:52:38 2015 +0200

    Merge remote-tracking branch 'origin/maser'

 src/gui/folder.h        | 4 ++--
 src/gui/owncloudgui.cpp | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)


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