← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/release-notes/bzr-2.5.txt

  • Committer: John Arbash Meinel
  • Date: 2011-07-18 15:09:20 UTC
  • mfrom: (6015.3.5 2.4)
  • mto: This revision was merged to the branch mainline in revision 6032.
  • Revision ID: john@arbash-meinel.com-20110718150920-19l4k8i6djiiv0j3
Merge bzr/2.4 into bzr.dev. Resolve a release-notes (NEWS) conflict, in favor of putting
the 2.4 entry into 2.5 where it belonged.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.5.txt
46
46
  that subfolder.
47
47
  (Bastian Bowe, #809901)
48
48
 
 
49
* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
 
50
 
49
51
* TreeTransformBase.fixup_new_roots no longer forces trees to have a root, so
50
52
  operations that use it, like merge, can now create trees without a root.
51
53
  (Aaron Bentley)