Viewing all changes in revision 5448.
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-09-27 20:08:36 UTC
- mfrom: (5447.1.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20100927200836-asjq41qt5fol30df
(vila) Merge lp:bzr/2.2 into trunk including fixes for #644855,
        #646133, #632387 (Vincent Ladeuil)
        #646133, #632387 (Vincent Ladeuil)
- files added:
- 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
- bzrlib/tests/per_bzrdir
- files renamed:
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- 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
