OpenLP

Merge lp://qastaging/~springermac/openlp/packaging into lp://qastaging/openlp/packaging

  1. packaging
  2. Merge into packaging
Proposed by Jonathan Springer
Status: Merged
Approved by: Tomas Groth
Approved revision: 26
Merged at revision: 28
Proposed branch: lp://qastaging/~springermac/openlp/packaging
Merge into: lp://qastaging/openlp/packaging
Diff against target: 122 lines (+3/-54)
5 files modified
osx/Info.plist (+0/-2)
osx/macosx-builder.py (+1/-4)
pyinstaller-hooks/hook-openlp.core.ui.media.py (+1/-1)
pyinstaller-hooks/rthook_openlp_pyqt4.py (+0/-43)
windows/windows-builder.py (+1/-4)
To merge this branch: bzr merge lp://qastaging/~springermac/openlp/packaging
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Raoul Snyman Approve
Review via email: mp+281353@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-12-24.

Description of the change

Changes for Qt5

To post a comment you must log in.
Revision history for this message
Jonathan Springer (springermac) wrote : Posted in a previous version of this proposal

Need to branch the current packaging trunk to 2.2 before this is merged.

Revision history for this message
Tomas Groth (tomasgroth) wrote : Posted in a previous version of this proposal

I think something has gone wrong here... There seems to be way to many changes, and most are already in the repo. You probably shouldn't re-use branches!

review: Needs Fixing
Revision history for this message
Jonathan Springer (springermac) wrote :

Whoops I proposed the merge against trunk instead of packaging!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Packaging has been branched.

review: Approve
Revision history for this message
Tomas Groth (tomasgroth) :
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.

Subscribers

People subscribed via source and target branches