← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

Viewing all changes in revision 128.10.28.

Committer: Martin Albisetti
Date: 2008-07-09 08:39:59 UTC
mfrom: (180 trunk)
mto: This revision was merged to the branch mainline in revision 182.
Revision ID: argentina@gmail.com-20080709083959-m7f43hnbuhejitum

Merge from trunk, resolved conflicts

files added:
loggerhead/wholehistory.py

files modified:
loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/apps/filesystem.py

loggerhead/controllers/__init__.py

loggerhead/controllers/atom_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/download_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/history.py

loggerhead/templates/browse.pt

loggerhead/templates/revisionfilechanges.pt

loggerhead/tests/test_simple.py

loggerhead/util.py

start-loggerhead.py

Show diffs side-by-side

added added

removed removed

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/apps/filesystem.py

loggerhead/controllers/__init__.py

loggerhead/controllers/atom_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/download_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/history.py

loggerhead/templates/browse.pt

loggerhead/templates/revisionfilechanges.pt

loggerhead/tests/test_simple.py

loggerhead/util.py

loggerhead/wholehistory.py

start-loggerhead.py

Older »