← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to load_test_scripts/multiple_instances.script

Committer: Michael Hudson
Date: 2008-06-16 11:25:25 UTC
mfrom: (160 trunk)
mto: This revision was merged to the branch mainline in revision 164.
Revision ID: michael.hudson@canonical.com-20080616112525-t1vsjh4s3knwpou3

merge trunk, rather brutally resolving conflicts

files removed:
loggerhead/textindex.py

files modified:
README.txt

loggerhead.conf.example

loggerhead/branchview.py

loggerhead/changecache.py

loggerhead/controllers/__init__.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/atom_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/history.py

loggerhead/util.py

start-loggerhead.py

Show diffs side-by-side

added added

removed removed

load_test_scripts/multiple_instances.script

Older »