Viewing all changes in revision 5439.1.1.
- Committer: Andrew Bennetts
- Date: 2010-09-23 07:40:07 UTC
- mfrom: (5050.17.24 2.2)
- mto: This revision was merged to the branch mainline in revision 5440.
- Revision ID: andrew.bennetts@canonical.com-20100923074007-bqk101393z4npbw0
Merge lp:bzr/2.2.
- files added:
- bzrlib/controldir.py
- bzrlib/tests/per_bzrdir
- files renamed:
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => bzrlib/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_bzrdir_colo/ => bzrlib/tests/per_controldir_colo/
- files modified:
- Makefile
expand all
collapse all
added
removed
