~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 5340.4.8.
-
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.
-
bzrlib/doc_generate/builders
-
bzrlib/doc_generate/writers
-
bzrlib/plugins/changelog_merge
-
bzrlib/plugins/changelog_merge/tests
-
bzrlib/plugins/weave_fmt/tests
-
bzrlib/tests/doc_generate
-
bzrlib/tests/doc_generate/builders
-
bzrlib/tests/doc_generate/writers
-
bzrlib/tests/per_repository_vf
- files renamed:
-
doc/en/release-notes/bzr-2.3.txt
=>
NEWS
-
bzrlib/tests/per_controldir/
=>
bzrlib/tests/per_bzrdir/
-
bzrlib/tests/per_controldir_colo/
=>
bzrlib/tests/per_bzrdir_colo/
-
bzrlib/tests/per_repository_vf/helpers.py
=>
bzrlib/tests/per_repository/helpers.py
-
bzrlib/plugins/weave_fmt/xml4.py
=>
bzrlib/xml4.py
expand all
collapse all
Show diffs side-by-side
added
removed