← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

Committer: Michael Hudson
Date: 2009-03-04 22:30:32 UTC
mfrom: (293 trunk)
mto: This revision was merged to the branch mainline in revision 294.
Revision ID: michael.hudson@canonical.com-20090304223032-01k7gmpm3jvokhu2

merge trunk, fixing conflicts

files added:
loggerhead/highlight.py

loggerhead/static/css/highlight.css

files modified:
NEWS

loggerhead/controllers/__init__.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/inventory_ui.py

loggerhead/history.py

loggerhead/static/css/annotate.css

loggerhead/static/css/diff.css

loggerhead/static/css/global.css

loggerhead/templates/annotate.pt

loggerhead/templates/changelog.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revisioninfo.pt

loggerhead/util.py

loggerhead/zptsupport.py

Show diffs side-by-side

added added

removed removed

Older »