← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5810.1.1.

  • Committer: Vincent Ladeuil
  • Date: 2011-04-28 12:26:34 UTC
  • mfrom: (5609.33.5 2.3)
  • mto: This revision was merged to the branch mainline in revision 5811.
  • Revision ID: v.ladeuil+lp@free.fr-20110428122634-rzbnq9u3aircltdo
Merge 2.3 into trunk resolving conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: