← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6161.1.6.

  • Committer: Vincent Ladeuil
  • Date: 2011-09-29 15:50:58 UTC
  • mfrom: (6177 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6178.
  • Revision ID: v.ladeuil+lp@free.fr-20110929155058-zgbecmx1huzktegm
Merge trunk and resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: