← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-05 02:46:38 UTC
  • mfrom: (4398.5.20 bencode_serializer)
  • Revision ID: pqm@pqm.ubuntu.com-20090605024638-fe5tn388osc38jvw
(bialix, jelmer, jam) Pyrex bencode and --development7-rich-root

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
47
47
from bzrlib.registry import Registry
48
48
from bzrlib.symbol_versioning import *
49
49
from bzrlib.textmerge import TextMerge
50
 
from bzrlib.util import bencode
 
50
from bzrlib import bencode
51
51
 
52
52
 
53
53
adapter_registry = Registry()