~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 6228.3.4.
-
Committer:
Jelmer Vernooij
-
Date:
2012-01-06 22:44:57 UTC
-
mfrom:
(6436 +trunk)
-
mto:
(6437.3.11 2.5)
-
mto:
This revision was merged to the branch mainline in
revision
6444.
-
Revision ID:
jelmer@samba.org-20120106224457-re0pcy0fz31xob77
Merge bzr.dev.
-
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/po_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/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