« back to all changes in this revision
Viewing changes to doc/en/index.txt
- Committer: Gary van der Merwe
- Date: 2010-08-02 19:56:52 UTC
- mfrom: (5050.3.18 2.2)
- mto: (5050.3.19 2.2)
- mto: This revision was merged to the branch mainline in revision 5371.
- Revision ID: garyvdm@gmail.com-20100802195652-o1ppjemhwrr98i61
Merge lp:bzr/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
- bzrlib/tests/per_bzrdir
- 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
added
removed
doc/en/index.txt
