Viewing all changes in revision 12457.2.7.
- Committer: Robert Collins
- Date: 2011-02-27 19:45:44 UTC
- mfrom: (12475 launchpad)
- mto: This revision was merged to the branch mainline in revision 12481.
- Revision ID: robert@canonical.com-20110227194544-wt0gq1zm7b4s9piw
Merge trunk.
- files added:
- bzrplugins/optional/README
- utilities/snakefood
- zcml
- files removed:
- BRANCH.TODO
- benchmarks
- lib/canonical/widgets
- logs
- todo
- files renamed:
- optionalbzrplugins/ => bzrplugins/optional/
- lp-sfood-packages => utilities/snakefood/lp-sfood-packages
- ftesting.zcml => zcml/ftesting.zcml
- override-configure-normal.zcml => zcml/override-configure-normal.zcml
- override-configure-testing.zcml => zcml/override-configure-testing.zcml
- override-configure.zcml => zcml/override-configure.zcml
- override-includes/ => zcml/override-includes/
- override-meta.zcml => zcml/override-meta.zcml
- package-includes/ => zcml/package-includes/
- script-testing.zcml => zcml/script-testing.zcml
- script.zcml => zcml/script.zcml
- securitypolicy.zcml => zcml/securitypolicy.zcml
- summarizerequests.zcml => zcml/summarizerequests.zcml
- zopeapp.zcml => zcml/zopeapp.zcml
- zopeappbrowser.zcml => zcml/zopeappbrowser.zcml
- zopeappsession.zcml => zcml/zopeappsession.zcml
- files modified:
- .bzrignore
expand all
collapse all
added
removed
