To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

Viewing all changes in revision 533.1.1.

Committer: Jasper Groenewegen
Date: 2008-07-17 21:00:10 UTC
mto: (533.2.1 mergedialog)
mto: This revision was merged to the branch mainline in revision 534 .
Revision ID: colbrac@xs4all.nl-20080717210010-31seo8vr1g0tyrzg

Replace MergeDialog with glade-less version.
Move merge.py to olive/merge.py

added added

removed removed