← Back to branch summary

~thelinuxguy/openlp/angular2-remote

~thelinuxguy/openlp/angular2-remote

Viewing all changes in revision 2750.

Committer: Tim Bentley
Date: 2016-08-12 05:15:56 UTC
mfrom: (2661.1.30 openlp)
Revision ID: tim.bentley@gmail.com-20160812051556-8m8vosh7bcwsefc9

Merge and fix mess

files modified:
openlp/core/common/settings.py

openlp/core/lib/mediamanageritem.py

openlp/core/resources.py

openlp/core/ui/advancedtab.py

openlp/core/ui/exceptiondialog.py

openlp/core/ui/exceptionform.py

openlp/core/ui/generaltab.py

openlp/core/ui/mainwindow.py

openlp/core/ui/slidecontroller.py

openlp/plugins/media/lib/mediaitem.py

openlp/plugins/presentations/lib/messagelistener.py

openlp/plugins/presentations/lib/presentationtab.py

tests/functional/openlp_core_ui/test_slidecontroller.py

Show diffs side-by-side

added added

removed removed

openlp/core/common/settings.py

openlp/core/lib/mediamanageritem.py

openlp/core/resources.py

openlp/core/ui/advancedtab.py

openlp/core/ui/exceptiondialog.py

openlp/core/ui/exceptionform.py

openlp/core/ui/generaltab.py

openlp/core/ui/mainwindow.py

openlp/core/ui/slidecontroller.py

openlp/plugins/media/lib/mediaitem.py

openlp/plugins/presentations/lib/messagelistener.py

openlp/plugins/presentations/lib/presentationtab.py

tests/functional/openlp_core_ui/test_slidecontroller.py

Older »