← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/chroot.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/chroot.py
19
19
"""
20
20
 
21
21
from bzrlib.transport import (
22
 
    get_transport,
23
22
    pathfilter,
24
23
    register_transport,
25
 
    Server,
26
 
    Transport,
27
 
    unregister_transport,
28
24
    )
29
25
 
30
26