Rev 546: Merge fix for import of launch in olive. in file:///data/jelmer/bzr-gtk/trunk/

Jelmer Vernooij jelmer at
Fri Jul 18 11:40:24 BST 2008

At file:///data/jelmer/bzr-gtk/trunk/

revno: 546
revision-id: jelmer at
parent: jelmer at
parent: colbrac at
committer: Jelmer Vernooij <jelmer at>
branch nick: trunk
timestamp: Fri 2008-07-18 12:40:23 +0200
  Merge fix for import of launch in olive.
    revno: 531.5.1
    revision-id: colbrac at
    parent: jelmer at
    committer: Jasper Groenewegen <colbrac at>
    branch nick: fix-launch
    timestamp: Thu 2008-07-10 12:15:23 +0200
      Fix import changed in rev 523
=== modified file 'olive/'
--- a/olive/	2008-07-10 21:57:38 +0000
+++ b/olive/	2008-07-18 10:40:23 +0000
@@ -30,13 +30,13 @@
 import bzrlib.errors as errors
 from bzrlib.workingtree import WorkingTree
-from bzrlib.plugins.gtk import _i18n, launch
+from bzrlib.plugins.gtk import _i18n
 from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
 from bzrlib.plugins.gtk.errors import show_bzr_error
 from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
 from bzrlib.plugins.gtk.diff import DiffWindow
-from bzrlib.plugins.gtk.olive import Preferences
+from bzrlib.plugins.gtk.olive import Preferences, launch
 class OliveMenu:
     """ This class is responsible for building the context menus. """

More information about the bazaar-commits mailing list