~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 5050.73.11.
-
Committer:
Vincent Ladeuil
-
Date:
2011-07-06 09:22:00 UTC
-
mfrom:
(6008 +trunk)
-
mto:
(6012.1.1 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6013.
-
Revision ID:
v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk
-
bzrlib/plugins/changelog_merge
-
bzrlib/plugins/changelog_merge/tests
-
bzrlib/plugins/weave_fmt/tests
-
bzrlib/tests/per_repository_vf
-
bzrlib/xml4.py
=>
bzrlib/plugins/weave_fmt/xml4.py
-
bzrlib/tests/per_repository/helpers.py
=>
bzrlib/tests/per_repository_vf/helpers.py
expand all
collapse all
Show diffs side-by-side
added
removed