Viewing all changes in revision 464.1.1.
- Committer: Robert Collins
- Date: 2012-02-02 04:58:46 UTC
- mfrom: (407.2.9 loggerhead)
- mto: This revision was merged to the branch mainline in revision 465.
- Revision ID: robertc@robertcollins.net-20120202045846-i221bwch22os8faq
Fix conflicts.
- files added:
- HACKING
- docs
- docs/_build
- docs/_static
- docs/_templates
- load_test_scripts
- loggerhead/static/downloads
- 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/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/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/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/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/yuitest
- loggerhead/static/javascript/yui/build/yuitest/assets
- files removed:
- loggerhead.conf.example
- files renamed:
- README.txt => README
- loggerhead/apps/filesystem.py => loggerhead/apps/transport.py
- loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py
- serve-branches => loggerhead/main.py *
- loggerhead/static/css/annotate.css => loggerhead/static/css/view.css
- loggerhead/templates/annotate.pt => loggerhead/templates/view.pt
- files modified:
- .bzrignore
- setup.py *
expand all
collapse all
added
removed
loggerhead/static/images/bg_Tabs.gif
loggerhead/static/images/bg_menuTabs.gif
loggerhead/static/images/bg_submenuTabs.gif
loggerhead/static/images/favicon.png
loggerhead/static/images/ico_bug.png
loggerhead/static/images/ico_tag.gif
loggerhead/static/images/notification-private.png
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
