[Pkg-owncloud-commits] [owncloud-client] 342/470: Merge pull request #4683 from owncloud/fix4657

[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 c4577cb2a1eee71501eeab19adab860b201b17a9
Merge: fafca26 d1649ce
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Apr 15 14:28:38 2016 +0200

    Merge pull request #4683 from owncloud/fix4657
    
    OS X: Allow ampersand in APPLICATION_NAME #4657

 CMakeLists.txt                          | 5 +++++
 admin/osx/macosx.pkgproj                | 6 +++---
 cmake/modules/MacOSXBundleInfo.plist.in | 2 +-
 csync/src/CMakeLists.txt                | 6 ------
 shell_integration/MacOSX/CMakeLists.txt | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

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