« back to all changes in this revision
Viewing changes to Makefile
- Committer: John Arbash Meinel
- Date: 2011-03-16 11:40:05 UTC
- mfrom: (434 trunk-rich)
- mto: This revision was merged to the branch mainline in revision 435.
- Revision ID: john@arbash-meinel.com-20110316114005-1rdrmdu9hda30xak
Merge trunk to resolve text conflict in deleting setup_logging
- files added:
- HACKING
- load_test_scripts
- files removed:
- docs/start-loggerhead.rst
- files renamed:
- loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py
- loggerhead/static/css/annotate.css => loggerhead/static/css/view.css
- loggerhead/templates/annotate.pt => loggerhead/templates/view.pt
- files modified:
- .bzrignore
added
removed
Makefile
