Merge branch 'master' of github.com:micahflee/onionshare

This commit is contained in:
Micah Lee 2014-06-21 15:21:40 -04:00
commit 8f9d43055c

View File

@ -29,6 +29,7 @@ if platform.system() == 'Darwin':
'includes': ['PyQt4'], 'includes': ['PyQt4'],
'excludes': ['PyQt4.QtDesigner', 'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtSql', 'PyQt4.QtTest', 'PyQt4.QtXml', 'PyQt4.phonon'], 'excludes': ['PyQt4.QtDesigner', 'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtSql', 'PyQt4.QtTest', 'PyQt4.QtXml', 'PyQt4.phonon'],
'iconfile': 'setup/onionshare.icns', 'iconfile': 'setup/onionshare.icns',
'qt_plugins': 'imageformats',
'site_packages': True, 'site_packages': True,
'plist': { 'plist': {
'CFBundleName': 'OnionShare', 'CFBundleName': 'OnionShare',