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

Committer: Jelmer Vernooij
Date: 2011-03-02 15:24:46 UTC
Revision ID: jelmer@samba.org-20110302152446-q8iogg8f2rweh25s

start on 0.101.0

files added:
bzr-notify

commands.py

icons/bzr-panel.svg

icons/emblem-bzr-ignored.svg

info.py

keyring.py

lock.py

loom.py

preferences/TODO

preferences/notifications.py

search.py

tests/test_annotate_config.py

tests/test_revisionview.py

files removed:
cmenu.ui

genpot.sh

olive

olive-gtk

olive-gtk.1

olive-gtk.desktop

olive.glade

olive.gladep

olive/__init__.py

olive/add.py

olive/bookmark.py

olive/guifiles.py

olive/info.py

olive/info_helper.py

olive/launch.py

olive/menu.py

olive/mkdir.py

olive/move.py

olive/remove.py

olive/rename.py

tests/test_preferences.py

tests/test_tortoise_bzr.py

files modified:
.bzrignore

AUTHORS

HACKING

MANIFEST.in

NEWS

README

__init__.py

about.py

annotate/colormap.py

annotate/config.py

annotate/gannotate.py

bazaar-properties.desktop

branchbox.py

branchview/__init__.py

branchview/linegraph.py

branchview/treemodel.py

branchview/treeview.py

bzr-handle-patch

bzr-handle-patch.desktop

bzr-notify.desktop

checkout.py

commit.py

conflicts.py

dialog.py

diff.py

errors.py

merge.py

mergedirective.py

missing.py

nautilus-bzr.py

notify.py

preferences/__init__.py

preferences/identity.py

preferences/plugins.py

push.py

revisionmenu.py

revisionview.py

seahorse.py

setup.py

status.py

tests/__init__.py

tests/test_commit.py

tests/test_diff.py

tests/test_history.py

tests/test_linegraph.py

ui.py

viz/branchwin.py

window.py

Show diffs side-by-side

added added

removed removed

mergedirective.py

22

22

23

23

import bzrlib

24

24

import gtk

25

import os

26

25

27

26

from bzrlib.plugins.gtk.branchbox import BranchSelectionBox

28

27

Older »