← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Jelmer Vernooij
  • Date: 2009-05-15 02:36:03 UTC
  • mto: This revision was merged to the branch mainline in revision 4369.
  • Revision ID: jelmer@samba.org-20090515023603-x7jsmtb5h66y7efp
Import malloc and friends from stdlib.h rather than from (deprecated) malloc.h.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
28
28
    trace,
29
29
    ui,
30
30
    )
31
 
from bzrlib import bencode
 
31
from bzrlib.util import bencode
32
32
""")
33
33
from bzrlib.tuned_gzip import GzipFile
34
34