← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to load_test_scripts/simple.script

Committer: Martin Albisetti
Date: 2008-07-22 00:40:03 UTC
mfrom: (182 loggerhead.search_integration)
mto: (157.1.3 loggerhead)
mto: This revision was merged to the branch mainline in revision 187.
Revision ID: argentina@gmail.com-20080722004003-lx1fp0tthpp6kl92

Merged from trunk, resolved billions of conflicts

files added:
loggerhead/controllers/search_ui.py

loggerhead/search.py

loggerhead/static/javascript/custom.js

loggerhead/static/javascript/mootools-1.2-more.js

loggerhead/templates/search.pt

loggerhead/wholehistory.py

files removed:
loggerhead/static/javascript/custom.js

loggerhead/static/javascript/mootools-1.2-more.js

files modified:
NEWS

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/macros.pt

loggerhead/tests/test_simple.py

loggerhead/util.py

start-loggerhead.py

Show diffs side-by-side

added added

removed removed

load_test_scripts/simple.script

Older »