Viewing all changes in revision 5387.2.7.
- Committer: John Arbash Meinel
- Date: 2010-09-25 20:08:01 UTC
- mfrom: (5444 +trunk)
- mto: This revision was merged to the branch mainline in revision 5445.
- Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.
- 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
