← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
46
46
""")
47
47
 
48
48
from bzrlib.symbol_versioning import (
49
 
        DEPRECATED_PARAMETER,
50
 
        )
 
49
    DEPRECATED_PARAMETER,
 
50
    )
51
51
from bzrlib.trace import (
52
52
    mutter,
53
53
    )