Andreas Preikschat has proposed merging lp:~googol/openlp/120-chars into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~googol/openlp/120-chars/+merge/175658 Changed to 120 chars -- https://code.launchpad.net/~googol/openlp/120-chars/+merge/175658 Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/120-chars into lp:openlp.
=== modified file 'openlp.py' --- openlp.py 2013-01-31 18:40:17 +0000 +++ openlp.py 2013-07-18 19:30:58 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/__init__.py' --- openlp/__init__.py 2013-02-01 19:58:18 +0000 +++ openlp/__init__.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/core/ui/media/vendor/__init__.py' --- openlp/core/ui/media/vendor/__init__.py 2013-01-16 21:03:01 +0000 +++ openlp/core/ui/media/vendor/__init__.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/alerts/lib/db.py' --- openlp/plugins/alerts/lib/db.py 2013-04-18 17:17:00 +0000 +++ openlp/plugins/alerts/lib/db.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/bibles/__init__.py' --- openlp/plugins/bibles/__init__.py 2013-04-18 17:45:14 +0000 +++ openlp/plugins/bibles/__init__.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/bibles/forms/languageform.py' --- openlp/plugins/bibles/forms/languageform.py 2013-04-18 17:45:14 +0000 +++ openlp/plugins/bibles/forms/languageform.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/media/__init__.py' --- openlp/plugins/media/__init__.py 2013-04-19 19:15:12 +0000 +++ openlp/plugins/media/__init__.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/media/lib/__init__.py' --- openlp/plugins/media/lib/__init__.py 2012-12-29 20:56:56 +0000 +++ openlp/plugins/media/lib/__init__.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py' --- openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2013-06-30 18:03:26 +0000 +++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/remotes/__init__.py' --- openlp/plugins/remotes/__init__.py 2012-12-29 20:56:56 +0000 +++ openlp/plugins/remotes/__init__.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/songs/lib/test/test_import_file.py' --- openlp/plugins/songs/lib/test/test_import_file.py 2013-02-04 21:22:12 +0000 +++ openlp/plugins/songs/lib/test/test_import_file.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'openlp/plugins/songs/lib/test/test_importing_lots.py' --- openlp/plugins/songs/lib/test/test_importing_lots.py 2013-02-04 21:22:12 +0000 +++ openlp/plugins/songs/lib/test/test_importing_lots.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'resources/__init__.py' --- resources/__init__.py 2012-12-29 20:56:56 +0000 +++ resources/__init__.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'resources/pyinstaller/hook-openlp.core.ui.media.py' --- resources/pyinstaller/hook-openlp.core.ui.media.py 2012-12-29 20:56:56 +0000 +++ resources/pyinstaller/hook-openlp.core.ui.media.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py' --- resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2012-12-29 20:56:56 +0000 +++ resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'resources/pyinstaller/hook-openlp.py' --- resources/pyinstaller/hook-openlp.py 2012-12-29 20:56:56 +0000 +++ resources/pyinstaller/hook-openlp.py 2013-07-18 19:30:58 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'scripts/check_dependencies.py' --- scripts/check_dependencies.py 2013-07-16 20:00:18 +0000 +++ scripts/check_dependencies.py 2013-07-18 19:30:58 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'scripts/translation_utils.py' --- scripts/translation_utils.py 2013-02-04 22:05:19 +0000 +++ scripts/translation_utils.py 2013-07-18 19:30:58 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # === modified file 'setup.py' --- setup.py 2013-06-23 15:29:16 +0000 +++ setup.py 2013-07-18 19:30:58 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection #
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
