/b-gtk/fix-viz : revision 399.1.13

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: Daniel Schierbeck
Date: 2008-03-15 20:54:34 UTC
mfrom: (452.2.3 trunk)
mto: (450.1.11 trunk) (399.1.17 signatures)
mto: This revision was merged to the branch mainline in revision 458.
Revision ID: daniel.schierbeck@gmail.com-20080315205434-kyrh22sjeao3g9j4

Merged with mainline.

files added:
handle-patch

icons/emblem-bzr-added.svg

icons/emblem-bzr-conflict.svg

icons/emblem-bzr-controlled.svg

icons/emblem-bzr-modified.svg

icons/emblem-bzr-removed.svg

po/ca.po

po/cs.po

po/de.po

po/en_GB.po

po/es.po

po/fr.po

po/hu.po

po/id.po

po/it.po

po/ku.po

po/pl.po

po/pt_BR.po

po/ru.po

po/sr.po

po/sv.po

files modified:
NEWS

README

__init__.py

about.py

annotate/gannotate.py

branchbox.py

branchview/graphcell.py

branchview/linegraph.py

branchview/treemodel.py

branchview/treeview.py

commit.py

conflicts.py

diff.py

mergedirective.py

nautilus-bzr.py

olive-gtk

olive/__init__.py

olive/guifiles.py

revbrowser.py

revisionmenu.py

revisionview.py

setup.py

tests/test_diff.py

viz/branchwin.py

Show diffs side-by-side

added added

removed removed

conflicts.py

100

gtk.CellRendererText(), text=0))

101

self._treeview.set_headers_visible(False)

102

self.model.append([ _("No conflicts in working tree.") ])

103

self._button_diff3.set_sensitive(False)

103

104

else:

104

105

self.model = gtk.ListStore(gobject.TYPE_STRING,

105

106

gobject.TYPE_STRING,

Older »