← 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: Max Bowsher
Date: 2011-03-04 15:49:43 UTC
mfrom: (431 trunk-rich)
mto: This revision was merged to the branch mainline in revision 432.
Revision ID: maxb@f2s.com-20110304154943-zrtlx1ipy49xc8u0

Merge trunk.

files added:
HACKING

info.py

load_test_scripts

load_test_scripts/multiple_instances.script

load_test_scripts/simple.script

loggerhead/controllers/annotate_ui.py

loggerhead/load_test.py

loggerhead/static/images/favicon.png

loggerhead/tests/test_load_test.py

files renamed:
loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py

loggerhead/static/css/annotate.css => loggerhead/static/css/view.css

loggerhead/templates/annotate.pt => loggerhead/templates/view.pt

files modified:
NEWS

__init__.py

loggerhead/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/controllers/__init__.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/highlight.py

loggerhead/static/css/diff.css

loggerhead/static/css/files.css

loggerhead/static/css/global.css

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

loggerhead/templatefunctions.py

loggerhead/templates/browse.pt

loggerhead/templates/changelog.pt

loggerhead/templates/directory.pt

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revisioninfo.pt

loggerhead/tests/__init__.py

loggerhead/tests/test_controllers.py

loggerhead/tests/test_simple.py

Show diffs side-by-side

added added

removed removed

Older »