~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 5363.2.15.
-
Committer:
Jelmer Vernooij
-
Date:
2010-08-17 22:24:01 UTC
-
mfrom:
(5379 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
5389.
-
Revision ID:
jelmer@samba.org-20100817222401-x6iblsx36pu6bi3r
Merge bzr.dev.
-
bzrlib/doc_generate/builders
-
bzrlib/doc_generate/writers
-
bzrlib/plugins/bash_completion
-
bzrlib/plugins/bash_completion/tests
-
bzrlib/plugins/news_merge
-
bzrlib/plugins/news_merge/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_uifactory
-
doc/developers/_templates
-
tools/win32/buildout-templates
-
tools/win32/buildout-templates/bin
- files removed:
-
bzrlib/benchmarks
-
bzrlib/benchmarks/tree_creator
-
bzrlib/util/configobj/docs
-
doc/es/guia-desarrollador
-
tools/doc_generate/
=>
bzrlib/doc_generate/
-
bzrlib/tests/branch_implementations/
=>
bzrlib/tests/per_branch/
-
bzrlib/tests/bzrdir_implementations/
=>
bzrlib/tests/per_controldir/
-
bzrlib/tests/interrepository_implementations/
=>
bzrlib/tests/per_interrepository/
-
bzrlib/tests/intertree_implementations/
=>
bzrlib/tests/per_intertree/
-
bzrlib/tests/inventory_implementations/
=>
bzrlib/tests/per_inventory/
-
bzrlib/tests/tree_implementations/
=>
bzrlib/tests/per_tree/
-
bzrlib/tests/workingtree_implementations/
=>
bzrlib/tests/per_workingtree/
-
doc/en/quick-reference/quick-start-summary.pdf
=>
doc/en/_static/en/bzr-en-quick-reference.pdf
-
doc/es/referencia-rapida/
=>
doc/es/quick-reference/
-
doc/es/guia-usuario/
=>
doc/es/user-guide/
expand all
collapse all
Show diffs side-by-side
added
removed