/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to merge.py

  • Committer: Curtis Hovey
  • Date: 2011-09-08 03:11:06 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110908031106-c0s7grzmctdyghcm
Fixed packing args.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
16
16
 
17
17
import os
18
18
 
19
 
from gi.repository import GObject
20
19
from gi.repository import Gtk
21
20
 
22
21
from bzrlib.branch import Branch
66
65
        self._hbox.add(self._label_merge_from)
67
66
        self._hbox.add(self._combo_source)
68
67
        self._hbox.set_spacing(5)
69
 
        self.action_area.pack_end(self._button_merge)
 
68
        self.action_area.pack_end(self._button_merge, False, False, 0)
70
69
        
71
70
        if self.default_branch_path and os.path.isdir(
72
71
                            self.default_branch_path.partition('file://')[2]):