~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 5875.3.27.
-
Committer:
Vincent Ladeuil
-
Date:
2011-06-27 15:42:09 UTC
-
mfrom:
(5993 +trunk)
-
mto:
(5993.1.1 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
5994.
-
Revision ID:
v.ladeuil+lp@free.fr-20110627154209-azubuhbuxsz109hq
Merge trunk
-
bzrlib/doc_generate/builders
-
bzrlib/doc_generate/writers
-
bzrlib/plugins/bash_completion
-
bzrlib/plugins/bash_completion/tests
-
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 removed:
-
bzrlib/benchmarks
-
bzrlib/benchmarks/tree_creator
-
bzrlib/xml4.py
=>
bzrlib/plugins/weave_fmt/xml4.py
-
bzrlib/tests/per_bzrdir/
=>
bzrlib/tests/per_controldir/
-
bzrlib/tests/per_bzrdir_colo/
=>
bzrlib/tests/per_controldir_colo/
-
bzrlib/tests/per_repository/helpers.py
=>
bzrlib/tests/per_repository_vf/helpers.py
expand all
collapse all
Show diffs side-by-side
added
removed