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

  • Committer: Jelmer Vernooij
  • Date: 2011-03-14 20:12:19 UTC
  • Revision ID: jelmer@samba.org-20110314201219-wo692nzwywu6mevh
Fix formatting, imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
41
41
    urlutils,
42
42
    workingtree,
43
43
)
44
 
from bzrlib.diff import show_diff_trees, internal_diff
 
44
from bzrlib.diff import show_diff_trees
45
45
from bzrlib.patches import parse_patches
46
46
from bzrlib.trace import warning
47
47
from bzrlib.plugins.gtk import _i18n
48
48
from bzrlib.plugins.gtk.window import Window
49
 
from dialog import error_dialog, info_dialog, warning_dialog
 
49
from bzrlib.plugins.gtk.dialog import (
 
50
    error_dialog,
 
51
    info_dialog,
 
52
    warning_dialog,
 
53
    )
50
54
 
51
55
 
52
56
def fallback_guess_language(slm, content_type):