Viewing all changes in revision 128.13.48.
- 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:
- .project
- files removed:
- COPYING.txt
- docs
- docs/_build
- docs/_static
- docs/_templates
- load_test_scripts
- loggerhead/middleware
- loggerhead/static/downloads
- loggerhead/static/javascript/yui
- loggerhead/static/javascript/yui/build
- loggerhead/static/javascript/yui/build/anim
- loggerhead/static/javascript/yui/build/attribute
- loggerhead/static/javascript/yui/build/base
- loggerhead/static/javascript/yui/build/classnamemanager
- loggerhead/static/javascript/yui/build/console
- loggerhead/static/javascript/yui/build/console/assets
- loggerhead/static/javascript/yui/build/console/assets/skins
- loggerhead/static/javascript/yui/build/console/assets/skins/sam
- loggerhead/static/javascript/yui/build/cookie
- loggerhead/static/javascript/yui/build/cssbase
- loggerhead/static/javascript/yui/build/cssfonts
- loggerhead/static/javascript/yui/build/cssgrids
- loggerhead/static/javascript/yui/build/cssreset
- loggerhead/static/javascript/yui/build/dd
- loggerhead/static/javascript/yui/build/dom
- loggerhead/static/javascript/yui/build/dump
- loggerhead/static/javascript/yui/build/event
- loggerhead/static/javascript/yui/build/get
- loggerhead/static/javascript/yui/build/io
- loggerhead/static/javascript/yui/build/json
- loggerhead/static/javascript/yui/build/loader
- loggerhead/static/javascript/yui/build/node
- loggerhead/static/javascript/yui/build/node-menunav
- loggerhead/static/javascript/yui/build/node-menunav/assets
- loggerhead/static/javascript/yui/build/node-menunav/assets/skins
- loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam
- loggerhead/static/javascript/yui/build/oop
- loggerhead/static/javascript/yui/build/overlay
- loggerhead/static/javascript/yui/build/overlay/assets
- loggerhead/static/javascript/yui/build/overlay/assets/skins
- loggerhead/static/javascript/yui/build/overlay/assets/skins/sam
- loggerhead/static/javascript/yui/build/plugin
- loggerhead/static/javascript/yui/build/profiler
- loggerhead/static/javascript/yui/build/queue
- loggerhead/static/javascript/yui/build/slider
- loggerhead/static/javascript/yui/build/slider/assets
- loggerhead/static/javascript/yui/build/slider/assets/skins
- loggerhead/static/javascript/yui/build/slider/assets/skins/sam
- loggerhead/static/javascript/yui/build/substitute
- loggerhead/static/javascript/yui/build/widget
- loggerhead/static/javascript/yui/build/widget/assets
- loggerhead/static/javascript/yui/build/widget/assets/skins
- loggerhead/static/javascript/yui/build/widget/assets/skins/sam
- loggerhead/static/javascript/yui/build/yui
- loggerhead/static/javascript/yui/build/yui-base
- loggerhead/static/javascript/yui/build/yuitest
- loggerhead/static/javascript/yui/build/yuitest/assets
- files renamed:
- README => README.txt
- loggerhead/apps/transport.py => loggerhead/apps/filesystem.py
- loggerhead/controllers/view_ui.py => loggerhead/controllers/annotate_ui.py
- loggerhead/static/css/view.css => loggerhead/static/css/annotate.css
- loggerhead/templates/view.pt => loggerhead/templates/annotate.pt
- loggerhead/main.py => serve-branches.py *
- start-loggerhead => start-loggerhead.py
- stop-loggerhead => stop-loggerhead.py
- files modified:
- .bzrignore
- setup.py *
expand all
collapse all
added
removed
loggerhead/static/images/favicon.png
loggerhead/static/images/ico_branch.gif
loggerhead/static/images/ico_bug.png
loggerhead/static/images/ico_folder_up.gif
loggerhead/static/images/ico_mergeto.gif
loggerhead/static/images/ico_tag.gif
loggerhead/static/images/spinner.gif
loggerhead/static/javascript/yui/build/console/assets/skins/sam/bg.png
loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam/horizontal-menu-submenu-indicator.png
loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam/horizontal-menu-submenu-toggle.png
loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam/vertical-menu-submenu-indicator.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/rail-classic-x.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/rail-classic-y.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/thumb-classic-x.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/thumb-classic-y.png
