← Back to branch summary

~mnordhoff/loggerhead/cheezum

~mnordhoff/loggerhead/cheezum

Viewing all changes in revision 456.

Committer: Matt Nordhoff
Date: 2010-04-24 02:22:22 UTC
mfrom: (164.107.64 trunk-rich)
Revision ID: mnordhoff@mattnordhoff.com-20100424022222-amo98wo6s9rf80px

Merge trunk, fixing conflicts.

files added:
docs

docs/Makefile

docs/_build

docs/_static

docs/_templates

docs/conf.py

docs/index.rst

docs/make.bat

docs/serve-branches.rst

docs/start-loggerhead.rst

docs/stop-loggerhead.rst

files modified:
.bzrignore

NEWS

README

__init__.py

loggerhead.conf.example

loggerhead/apps/branch.py

loggerhead/config.py

loggerhead/controllers/changelog_ui.py

loggerhead/highlight.py

loggerhead/static/css/annotate.css

loggerhead/static/css/global.css

loggerhead/templates/annotate.pt

loggerhead/templates/browse.pt

loggerhead/templates/directory.pt

loggerhead/templates/inventory.pt

loggerhead/util.py

loggerheadd

Show diffs side-by-side

added added

removed removed

docs/_templates/

docs/serve-branches.rst

docs/start-loggerhead.rst

docs/stop-loggerhead.rst

loggerhead.conf.example

loggerhead/apps/branch.py

loggerhead/config.py

loggerhead/controllers/changelog_ui.py

loggerhead/highlight.py

loggerhead/static/css/annotate.css

loggerhead/static/css/global.css

loggerhead/templates/annotate.pt

loggerhead/templates/browse.pt

loggerhead/templates/directory.pt

loggerhead/templates/inventory.pt

loggerhead/util.py

Older »