← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead.conf.example

Committer: Martin Albisetti
Date: 2008-08-14 22:45:52 UTC
mfrom: (212 trunk)
mto: (157.1.5 loggerhead)
mto: This revision was merged to the branch mainline in revision 423.
Revision ID: argentina@gmail.com-20080814224552-1wfbdgvsfo2h2469

Merge from trunk, resolved a gazillion conflicts

files added:
loggerhead/controllers/diff_ui.py

loggerhead/controllers/directory_ui.py

loggerhead/static/images/ico_branch.gif

loggerhead/static/images/ico_folder_up.gif

loggerhead/templates/directory.pt

loggerhead/templates/feed-link.pt

loggerhead/templates/menu.pt

loggerhead/templates/search-box.pt

serve-branches.1

files removed:
.project

loggerhead/release.py

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

files modified:
.bzrignore

NEWS

loggerhead/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/filesystem.py

loggerhead/changecache.py

loggerhead/history.py

loggerhead/static/css/annotate.css

loggerhead/static/css/global.css

loggerhead/static/javascript/custom.js

loggerhead/templatefunctions.py

loggerhead/templates/annotate.pt

loggerhead/templates/changelog.pt

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revisioninfo.pt

loggerhead/util.py

serve-branches

setup.py

start-loggerhead

start-loggerhead.1

stop-loggerhead

stop-loggerhead.1

Show diffs side-by-side

added added

removed removed

loggerhead.conf.example

Older »