~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 6524.1.1.
-
Committer:
Jelmer Vernooij
-
Date:
2012-06-18 11:43:07 UTC
-
mfrom:
(6437.54.10 2.5)
-
mto:
This revision was merged to the branch mainline in
revision
6525.
-
Revision ID:
jelmer@samba.org-20120618114307-zeazlym311p38m98
Merge 2.5.
-
bzrlib/plugins/changelog_merge
-
bzrlib/plugins/changelog_merge/tests
-
bzrlib/plugins/po_merge/tests
-
bzrlib/plugins/weave_fmt/tests
-
bzrlib/tests/per_repository_vf
-
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_repository/helpers.py
=>
bzrlib/tests/per_repository_vf/helpers.py
expand all
collapse all
Show diffs side-by-side
added
removed