← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/fakevfat.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/fakevfat.py
38
38
 
39
39
"""
40
40
 
 
41
from __future__ import absolute_import
 
42
 
41
43
import re
42
44
 
43
 
from bzrlib.errors import TransportNotPossible
44
45
from bzrlib.transport import decorator
45
46
 
46
47