~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 11:48:55 UTC
  • mfrom: (5029.2.2 integration2)
  • Revision ID: pqm@pqm.ubuntu.com-20100211114855-owq7q18cogsdbbpc
(vila) Don't add conflict related files unless explicitly required

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
57
57
  (Martin Pool, #331095)
58
58
 
 
59
* ``bzr add`` will not add conflict related files unless explicitly required.
 
60
  (Vincent Ladeuil, #322767, #414589)
 
61
 
59
62
* Network transfer amounts and rates are now displayed in SI units according
60
63
  to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
61
64
  (Gordon Tyler, #514399)