Viewing all changes in revision 4360.10.22.
- Committer: Matthew Fuller
- Date: 2010-12-04 15:02:11 UTC
- mfrom: (5050.3.21 2.2-final)
- mto: (5575.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 5576.
- Revision ID: fullermd@over-yonder.net-20101204150211-y4lb2kssm7o2uue2
Merge up through 2.2.0.
- files added:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/en/whats-new
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- doc/_static/en/quick-reference
- doc/en/developer-guide
- doc/en/migration
- doc/es/developer-guide
- doc/es/release-notes
- doc/es/user-reference
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- doc/en/developer-guide/HACKING.txt => doc/developers/HACKING.txt
- doc/Makefile => doc/en/Makefile
- doc/_static/ => doc/en/_static/
- doc/_static/en/quick-reference/Makefile => doc/en/_static/en/Makefile
- doc/_static/en/quick-reference/bzr-quick-reference.pdf => doc/en/_static/en/bzr-en-quick-reference.pdf
- doc/_static/en/quick-reference/bzr-quick-reference.png => doc/en/_static/en/bzr-en-quick-reference.png
- doc/_static/en/quick-reference/bzr-quick-reference.svg => doc/en/_static/en/bzr-en-quick-reference.svg
- doc/_templates/ => doc/en/_templates/
- doc/conf.py => doc/en/conf.py
- doc/contents.txt => doc/en/index.txt
- doc/make.bat => doc/en/make.bat
- doc/en/user-guide/index-for-2x.txt => doc/en/user-guide/index.txt
- doc/es/quick-reference/Makefile => doc/es/_static/es/Makefile
- 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/es/quick-reference/quick-start-summary.svg => doc/es/_static/es/bzr-es-quick-reference.svg
- doc/index.es.txt => doc/es/index.txt
- doc/ru/quick-reference/Makefile => doc/ru/_static/ru/Makefile
- 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
- doc/ru/quick-reference/quick-start-summary.svg => doc/ru/_static/ru/bzr-ru-quick-reference.svg
- doc/index.ru.txt => doc/ru/index.txt
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/Bazaar-Logo-For-Manuals.png
doc/developers/_static/bzr icon 16.png
doc/en/_static/en/bzr-en-quick-reference.svg
doc/es/_static/bzr icon 16.png
doc/es/_static/es/bzr-es-quick-reference.svg
doc/ja/_static/bzr icon 16.png
doc/ja/user-guide/images/workflows_centralized.png
doc/ja/user-guide/images/workflows_centralized.svg
doc/ja/user-guide/images/workflows_gatekeeper.png
doc/ja/user-guide/images/workflows_gatekeeper.svg
doc/ja/user-guide/images/workflows_localcommit.png
doc/ja/user-guide/images/workflows_localcommit.svg
doc/ja/user-guide/images/workflows_peer.png
doc/ja/user-guide/images/workflows_peer.svg
doc/ja/user-guide/images/workflows_pqm.png
doc/ja/user-guide/images/workflows_pqm.svg
doc/ja/user-guide/images/workflows_shared.png
doc/ja/user-guide/images/workflows_shared.svg
doc/ja/user-guide/images/workflows_single.png
doc/ja/user-guide/images/workflows_single.svg
doc/ru/_static/bzr icon 16.png
doc/ru/_static/ru/bzr-ru-quick-reference.svg
