~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/bash_completion
-
bzrlib/plugins/bash_completion/tests
-
bzrlib/plugins/changelog_merge
-
bzrlib/plugins/changelog_merge/tests
-
bzrlib/plugins/netrc_credential_store
-
bzrlib/plugins/netrc_credential_store/tests
-
bzrlib/plugins/news_merge
-
bzrlib/plugins/news_merge/tests
-
bzrlib/plugins/po_merge/tests
-
bzrlib/plugins/weave_fmt/tests
-
bzrlib/tests/per_controldir_colo
-
bzrlib/tests/per_foreign_vcs
-
bzrlib/tests/per_interbranch
-
bzrlib/tests/per_repository_chk
-
bzrlib/tests/per_repository_vf
-
bzrlib/tests/per_uifactory
-
doc/developers/_templates
-
tools/win32/buildout-templates
-
tools/win32/buildout-templates/bin
-
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/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