[Pkg-owncloud-commits] [owncloud-client] 47/219: Merge missing commits from 1.6.2-themefix 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 291231c5618d0c19c419b803e76a373fdd41fc51
Merge: 68792ee 753aa91
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Sat Aug 30 17:57:58 2014 +0200

    Merge missing commits from 1.6.2-themefix  into 1.7
    
    Conflicts:
    	VERSION.cmake

 ChangeLog                           | 3 ++-
 src/creds/shibbolethcredentials.cpp | 2 +-
 src/wizard/owncloudsetuppage.cpp    | 6 +++++-
 src/wizard/owncloudwizard.cpp       | 1 -
 4 files changed, 8 insertions(+), 4 deletions(-)


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