/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: Jelmer Vernooij
  • Date: 2007-02-03 14:19:44 UTC
  • Revision ID: jelmer@samba.org-20070203141944-oa6iqhetsy0slqo0
Fix references to dialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
28
28
from bzrlib.branch import Branch
29
29
import bzrlib.errors as errors
30
30
 
31
 
from olive.dialog import error_dialog, info_dialog, warning_dialog
 
31
from dialog import error_dialog, info_dialog, warning_dialog
32
32
from errors import show_bzr_error
33
33
from olive.guifiles import GLADEFILENAME
34
34