~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6513.

  • Committer: Patch Queue Manager
  • Date: 2012-03-29 12:27:52 UTC
  • mfrom: (6437.23.29 2.5_2.4_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20120329122752-d05to7wdet9w3886
(gz) Merge 2.4 for feature flag conflict resolution and _Win32Stat fix
 (Martin Packman)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: