/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 mergedirective.py

  • Committer: Mikkel Kamstrup Erlandsen
  • Date: 2011-09-28 07:45:39 UTC
  • mto: This revision was merged to the branch mainline in revision 740.
  • Revision ID: mikkel.kamstrup@gmail.com-20110928074539-qxl1yn1bkjel6ir0
https://launchpad.net/bugs/861201
Add X-GNOME-Autostart-Delay=30 to bzr-notify.desktop

Show diffs side-by-side

added added

removed removed

Lines of Context:
mergedirective.py
20
20
except:
21
21
    pass
22
22
 
23
 
import bzrlib
24
23
import gtk
25
 
import os
26
24
 
27
25
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
28
26
 
38
36
        # submittted
39
37
 
40
38
        # TODO: Create a frame with a the ability to select a branch
41
 
        
 
39
 
42
40
        # TODO: Create a frame with a button for selecting a file name 
43
41
        # for the bundle
44
42
        pass