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 merge.py
- Committer: Szilveszter Farkas (Phanatic)
- Date: 2007-02-03 17:16:46 UTC
- mfrom: (157.1.1 sent)
- mto: (157.1.2 trunk) (170.1.3 trunk)
- mto: This revision was merged to the branch mainline in revision 160.
- Revision ID: szilveszter.farkas@gmail.com-20070203171646-kdu7bhpz3mctcaai
Merge from trunk.
- files added:
- bzr-icon-64.png
- files removed:
- viz/bzrkapp.py
- files renamed:
- olive/branch.py => branch.py
- olive/checkout.py => checkout.py
- olive/commit.py => commit.py
- olive/dialog.py => dialog.py
- viz/diffwin.py => diff.py
- olive/errors.py => errors.py
- annotate/logview.py => logview.py
- olive/merge.py => merge.py
- olive/push.py => push.py
- olive/revbrowser.py => revbrowser.py
- olive/status.py => status.py
- olive/ui.py => ui.py
- files modified:
- __init__.py
added
removed
merge.py
