OpenLP

Merge lp:~googol-deactivatedaccount/openlp/bug-871441 into lp:openlp

  1. bug-871441
  2. Merge into trunk
Proposed by Andreas Preikschat
Status: Merged
Approved by: Tim Bentley
Approved revision: 1783
Merged at revision: 1791
Proposed branch: lp:~googol-deactivatedaccount/openlp/bug-871441
Merge into: lp:openlp
Diff against target: 12 lines (+1/-1)
1 file modified
openlp/core/ui/maindisplay.py (+1/-1)
To merge this branch: bzr merge lp:~googol-deactivatedaccount/openlp/bug-871441
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+80777@code.launchpad.net

Description of the change

- corrected comment

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Wow

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-10-29 19:13:11 +0000
+++ openlp/core/ui/maindisplay.py 2011-10-31 07:13:28 +0000
@@ -51,7 +51,7 @@
51 def __init__(self, parent, imageManager, live):51 def __init__(self, parent, imageManager, live):
52 if live:52 if live:
53 QtGui.QGraphicsView.__init__(self)53 QtGui.QGraphicsView.__init__(self)
54 # Do not overwrite the parent() method.54 # Overwrite the parent() method.
55 self.parent = lambda: parent55 self.parent = lambda: parent
56 else:56 else:
57 QtGui.QGraphicsView.__init__(self, parent)57 QtGui.QGraphicsView.__init__(self, parent)