← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3224.5.38.

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: