QBzr

Merge lp:~bialix/qbzr/encoding2-layout into lp:~songofacandy/qbzr/encoding2

  1. encoding2-layout
  2. Merge into encoding2
Proposed by Alexander Belchenko
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bialix/qbzr/encoding2-layout
Merge into: lp:~songofacandy/qbzr/encoding2
Diff against target: 25 lines (+2/-2)
2 files modified
lib/annotate.py (+1/-1)
lib/cat.py (+1/-1)
To merge this branch: bzr merge lp:~bialix/qbzr/encoding2-layout
Reviewer Review Type Date Requested Status
methane Pending
Review via email: mp+14790@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/annotate.py'
2--- lib/annotate.py 2009-11-12 13:47:24 +0000
3+++ lib/annotate.py 2009-11-12 16:40:23 +0000
4@@ -298,7 +298,7 @@
5 vbox = QtGui.QVBoxLayout(self.centralwidget)
6 vbox.addWidget(self.throbber)
7 vbox.addWidget(splitter)
8- hbox = QtGui.QHBoxLayout(self.centralwidget)
9+ hbox = QtGui.QHBoxLayout()
10 hbox.addWidget(self.encoding_selector)
11 hbox.addWidget(buttonbox)
12 vbox.addLayout(hbox)
13
14=== modified file 'lib/cat.py'
15--- lib/cat.py 2009-11-12 13:56:34 +0000
16+++ lib/cat.py 2009-11-12 16:40:23 +0000
17@@ -96,7 +96,7 @@
18 self.vbox.addWidget(self.throbber)
19 self.vbox.addStretch()
20
21- hbox = QtGui.QHBoxLayout(self.centralwidget)
22+ hbox = QtGui.QHBoxLayout()
23 hbox.addWidget(self.encoding_selector)
24 hbox.addWidget(self.buttonbox)
25 self.vbox.addLayout(hbox)

Subscribers

People subscribed via source and target branches

to all changes: