/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 olive/move.py

  • Committer: Jasper Groenewegen
  • Date: 2008-07-17 23:15:43 UTC
  • mto: This revision was merged to the branch mainline in revision 534.
  • Revision ID: colbrac@xs4all.nl-20080717231543-0hbkqs4emdi88bj1
Move merge.py back to main directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
 
32
32
from bzrlib.plugins.gtk import _i18n
33
33
from bzrlib.plugins.gtk.dialog import error_dialog
34
 
from errors import show_bzr_error
 
34
from bzrlib.plugins.gtk.errors import show_bzr_error
35
35
from guifiles import GLADEFILENAME
36
36
 
37
37