/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: Jelmer Vernooij
  • Date: 2011-03-11 23:00:17 UTC
  • mfrom: (719.1.3 bzr-gtk)
  • Revision ID: jelmer@canonical.com-20110311230017-yexxy58qe5f8fegx
Merge translations.

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
23
24
import gtk
24
25
 
25
26
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
36
37
        # submittted
37
38
 
38
39
        # TODO: Create a frame with a the ability to select a branch
39
 
 
 
40
        
40
41
        # TODO: Create a frame with a button for selecting a file name 
41
42
        # for the bundle
42
43
        pass