/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: Jasper Groenewegen
  • Date: 2008-07-18 18:25:39 UTC
  • mfrom: (533.2.4 mergedialog)
  • Revision ID: colbrac@xs4all.nl-20080718182539-h65s9vgvq2zrxhbs
Merge fixes for new MergeDialog

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
71
71
        # Add widgets to dialog
72
72
        self.vbox.add(self._hbox)
73
73
        self._hbox.add(self._label_merge_from)
74
 
        self._hbox.add(self.filechooser)
 
74
        self._hbox.add(self._filechooser)
75
75
        self._hbox.set_spacing(5)
76
76
        self.action_area.pack_end(self._button_merge)
77
77