← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Zearin
  • Date: 2010-11-12 22:43:38 UTC
  • mto: (5570.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5572.
  • Revision ID: zearin@users.sourceforge.net-20101112224338-x4dzw5gafju8txn5
Continued capitalization fixes.  (URL, URLs)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-1.1.txt
118
118
* ``merge --weave --uncommitted`` now works.  (Aaron Bentley)
119
119
 
120
120
* pycurl authentication handling was broken and incomplete. Fix handling of
121
 
  user:pass embedded in the urls.
 
121
  user:pass embedded in the URLs.
122
122
  (Vincent Ladeuil, #177643)
123
123
 
124
124
* Files inside non-directories are now handled like other conflict types.