~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 6165.4.29.
-
Committer:
Jelmer Vernooij
-
Date:
2011-10-14 13:56:45 UTC
-
mfrom:
(6215 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6216.
-
Revision ID:
jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
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/news_merge
-
bzrlib/plugins/news_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_foreign_vcs
-
bzrlib/tests/per_repository_vf
-
bzrlib/tests/per_uifactory
-
doc/developers/_templates
- files removed:
-
bzrlib/benchmarks
-
bzrlib/benchmarks/tree_creator
-
doc/_static/en/quick-reference
-
bzrlib/tests/per_bzrdir/
=>
bzrlib/tests/per_controldir/
-
bzrlib/tests/per_repository/helpers.py
=>
bzrlib/tests/per_repository_vf/helpers.py
-
doc/_static/
=>
doc/en/_static/
-
doc/_templates/
=>
doc/en/_templates/
-
doc/make.bat
=>
doc/en/make.bat
-
doc/es/quick-reference/quick-start-summary.pdf
=>
doc/es/_static/es/bzr-es-quick-reference.pdf
-
doc/es/quick-reference/quick-start-summary.png
=>
doc/es/_static/es/bzr-es-quick-reference.png
-
doc/ru/quick-reference/quick-start-summary.pdf
=>
doc/ru/_static/ru/bzr-ru-quick-reference.pdf
-
doc/ru/quick-reference/quick-start-summary.png
=>
doc/ru/_static/ru/bzr-ru-quick-reference.png
expand all
collapse all
Show diffs side-by-side
added
removed