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

  • Committer: Jelmer Vernooij
  • Date: 2010-02-28 15:19:15 UTC
  • mfrom: (674.1.1 bzr-gtk)
  • Revision ID: jelmer@samba.org-20100228151915-bvwflj8ongj2fwqd
Merge qense's indicator application work, but don't require appindicator to be installed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
29
29
from bzrlib.plugins.gtk import _i18n
30
30
 
31
31
from dialog import error_dialog, warning_dialog
32
 
 
 
32
from errors import show_bzr_error
33
33
 
34
34
class ConflictsDialog(gtk.Dialog):
35
35
    """ This dialog displays the list of conflicts. """
36
 
 
37
36
    def __init__(self, wt, parent=None):
38
37
        """ Initialize the Conflicts dialog. """
39
38
        gtk.Dialog.__init__(self, title="Conflicts - Olive",