← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
70
70
from bzrlib.decorators import needs_write_lock
71
71
from bzrlib.lazy_import import lazy_import
72
72
lazy_import(globals(), """
73
 
import errno
74
73
import fnmatch
75
74
import re
76
75
from cStringIO import StringIO