OpenLP

Merge lp://staging/~raoul-snyman/openlp/bug-1608194 into lp://staging/openlp

  1. bug-1608194
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 2694
Proposed branch: lp://staging/~raoul-snyman/openlp/bug-1608194
Merge into: lp://staging/openlp
Diff against target: 1080 lines (+670/-89)
7 files modified
.bzrignore (+1/-0)
openlp/core/ui/media/systemplayer.py (+13/-13)
openlp/plugins/songs/lib/__init__.py (+8/-9)
openlp/plugins/songs/lib/songselect.py (+76/-41)
tests/functional/openlp_core_ui/test_slidecontroller.py (+2/-2)
tests/functional/openlp_core_ui_media/test_systemplayer.py (+529/-0)
tests/functional/openlp_plugins/songs/test_songselect.py (+41/-24)
To merge this branch: bzr merge lp://staging/~raoul-snyman/openlp/bug-1608194
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+302867@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.