Viewing all changes in revision 5050.12.1.
- Committer: Martin Pool
- Date: 2010-07-21 09:58:42 UTC
- mfrom: (4797.58.7 2.1)
- mto: (5050.3.13 2.2)
- mto: This revision was merged to the branch mainline in revision 5365.
- Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2
- files removed:
- bzrlib/controldir.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- files renamed:
- bzrlib/doc_generate/conf.py => bzrlib/doc_generate/sphinx_conf.py
- bzrlib/tests/per_controldir/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/per_controldir/test_controldir.py => bzrlib/tests/per_bzrdir/test_bzrdir.py
- bzrlib/tests/per_controldir_colo/ => bzrlib/tests/per_bzrdir_colo/
- files modified:
- Makefile
expand all
collapse all
added
removed
