« back to all changes in this revision
Viewing changes to Makefile
- Committer: xaav at xaav
- Date: 2011-07-10 22:51:56 UTC
- mto: (459.2.1 trunk)
- mto: This revision was merged to the branch mainline in revision 461.
- Revision ID: xaav@xaav.tk-20110710225156-xtt237a7njqwti2p
Fixed buggy merging.
- files added:
- .project
- docs
- docs/_build
- docs/_static
- docs/_templates
- load_test_scripts
- loggerhead/static/downloads
- files removed:
- loggerhead.conf.example
- 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
