Viewing all changes in revision 5050.31.1.
- Committer: Andrew Bennetts
- Date: 2010-09-13 02:32:44 UTC
- mfrom: (4797.58.9 2.1)
- mto: (5050.17.16 2.2)
- mto: This revision was merged to the branch mainline in revision 5419.
- Revision ID: andrew.bennetts@canonical.com-20100913023244-100b3gi8ttwyrow2
Merge lp:bzr/2.1.
- files removed:
- NEWS
- 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:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- doc/en/release-notes/release-template.txt => NEWS-template.txt
- 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:
- .bzrignore
expand all
collapse all
added
removed
