~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 4988.1.2.
-
Committer:
John Arbash Meinel
-
Date:
2010-01-29 11:09:30 UTC
-
mfrom:
(4797.2.7 2.1)
-
mto:
This revision was merged to the branch mainline in
revision
4989.
-
Revision ID:
john@arbash-meinel.com-20100129110930-y6ins0x1phadj5c7
Merge 2.1.0rc2
- files added:
-
bzrlib/benchmarks
-
bzrlib/benchmarks/tree_creator
-
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_controldir_colo
-
bzrlib/tests/per_repository_vf
- files renamed:
-
doc/en/release-notes/bzr-2.3.txt
=>
NEWS
-
bzrlib/help_topics/es/conflict-types.txt
=>
bzrlib/help_topics/es/conflicts.txt
-
bzrlib/tests/per_controldir/
=>
bzrlib/tests/per_bzrdir/
-
bzrlib/tests/per_repository_vf/helpers.py
=>
bzrlib/tests/per_repository/helpers.py
expand all
collapse all
Show diffs side-by-side
added
removed