← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~meths/openlp/trivialfixes into lp:openlp

 

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
    openlp.org Core (openlp-core)

Fixed carriage returns in setup.py
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/10804
Your team openlp.org Core is subscribed to branch lp:openlp.
=== modified file 'setup.py'
--- setup.py	2008-12-03 10:57:34 +0000
+++ setup.py	2009-08-27 14:02:00 +0000
@@ -1,4 +1,13 @@
-from setuptools import setup

APP = ['openlp.pyw']
OPTIONS = {'argv_emulation': True, 'includes': ['sip', 'PyQt4']}

setup(
+from setuptools import setup
+
+APP = ['openlp.pyw']
+OPTIONS = {'argv_emulation': True, 'includes': ['sip', 'PyQt4']}
+
+setup(
     name='openlp.org',
     version='1.9.0',
-    url='http://www.openlp.org/',
    app=APP,
    options={'py2app': OPTIONS},
    setup_requires=['py2app'],
)
+    url='http://www.openlp.org/',
+    app=APP,
+    options={'py2app': OPTIONS},
+    setup_requires=['py2app'],
+)


Follow ups