← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-16 12:47:51 UTC
  • mfrom: (4797.43.16 2.1-integration)
  • mto: This revision was merged to the branch mainline in revision 5298.
  • Revision ID: v.ladeuil+lp@free.fr-20100616124751-knove5iu86fxk089
Merge 2.1 into bzr.dev including fix for bug #586926

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by