[Pkg-owncloud-commits] [owncloud-client] 309/470: Merge pull request #4658 from owncloud/fix-qt4-build

[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 68b7437afb1693b5e29a3a249b0581549b34e4c8
Merge: 41b950b c48b5c4
Author: Olivier Goffart <olivier at woboq.com>
Date:   Tue Apr 12 10:36:48 2016 +0200

    Merge pull request #4658 from owncloud/fix-qt4-build
    
    Fix qt4 build

 CMakeLists.txt             | 22 +---------------------
 src/CMakeLists.txt         | 14 ++++++++++++++
 src/gui/activitywidget.cpp | 39 ++++++++++++++++++++++-----------------
 src/gui/activitywidget.h   |  2 +-
 4 files changed, 38 insertions(+), 39 deletions(-)

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