← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

Viewing all changes in revision 294.3.2.

Committer: Matt Nordhoff
Date: 2009-03-16 23:21:29 UTC
mfrom: (302 trunk)
mto: This revision was merged to the branch mainline in revision 304.
Revision ID: mnordhoff@mattnordhoff.com-20090316232129-ionnr48frxx3i0ax

Merge trunk, fixing conflicts

files added:
__init__.py

loggerhead/controllers/revlog_ui.py

loggerhead/static/images/spinner.gif

loggerhead/templates/revlog.pt

files modified:
README.txt

loggerhead/apps/branch.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/highlight.py

loggerhead/history.py

loggerhead/static/javascript/changelog.js

loggerhead/static/javascript/custom.js

loggerhead/static/javascript/diff.js

loggerhead/templatefunctions.py

loggerhead/templates/changelog.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/tests/test_corners.py

Show diffs side-by-side

added added

removed removed

loggerhead/apps/branch.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/revlog_ui.py

loggerhead/highlight.py

loggerhead/history.py

loggerhead/static/images/spinner.gif

loggerhead/static/javascript/changelog.js

loggerhead/static/javascript/custom.js

loggerhead/static/javascript/diff.js

loggerhead/templatefunctions.py

loggerhead/templates/changelog.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revlog.pt

loggerhead/tests/test_corners.py

Older »