← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6404.6.4.

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 17:56:30 UTC
  • mfrom: (6434 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105175630-kp0kt0el27s40q0x
Merge trunk resolving conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: