Viewing all changes in revision 1794.
- Committer: shikhar
- Date: 2011-06-03 09:08:28 UTC
- mfrom: (1790.1.521 eden)
- Revision ID: shikhar@shikhar-laptop-20110603090828-bj0nc0zba3ubxj8i
Merged trunk
- files added:
- controllers/climate.py
- static/formats/s3csv
- tests/selenium/scripts/actions
- tests/selenium/scripts/config
- tests/selenium/tests
- tests/unit
- views/climate
- views/scenario
- files removed:
- controllers/pf.py
- static/selenium/tests
- files renamed:
- models/06_irs.py => models/05_irs.py
- models/hrm.py => models/06_hrm.py
- models/06_doc.py => models/doc.py
- models/zzz_last.py => models/zz_last.py
- static/selenium/ => tests/selenium/
- views/pf/ => views/mpr/
- files modified:
- .bzrignore
expand all
collapse all
added
removed
static/img/BFTBmenu_back.png
static/img/BFTBmenu_hilight.png
static/img/BFTBmenu_side.png
static/img/S3menu_logo.png
static/img/S3menu_side.png
static/img/arrow_blue_right.png
static/img/email_icon.png
static/img/markers/gis_marker.image.Hydro_Meteor_Flood.png
