Viewing all changes in revision 4570.4.4.
- Committer: Robert Collins
- Date: 2009-08-25 23:47:08 UTC
- mfrom: (4650 +trunk)
- mto: This revision was merged to the branch mainline in revision 4651.
- Revision ID: robertc@robertcollins.net-20090825234708-utgl9u6v12sosp5c
NEWSÂ Conflict.
- files added:
- bzrlib/textui.py
- 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 removed:
- MANIFEST.in
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/apport
- 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 renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- doc/en/Makefile => doc/Makefile
- doc/en/_static/ => doc/_static/
- doc/en/_static/en/Makefile => doc/_static/en/quick-reference/Makefile
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/_static/en/quick-reference/bzr-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/_static/en/quick-reference/bzr-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/_static/en/quick-reference/bzr-quick-reference.svg
- doc/en/_templates/ => doc/_templates/
- doc/en/conf.py => doc/conf.py
- doc/en/index.txt => doc/contents.txt
- doc/developers/HACKING.txt => doc/en/developer-guide/HACKING.txt
- doc/en/user-guide/index.txt => doc/en/user-guide/index-for-2x.txt
- doc/es/_static/es/Makefile => doc/es/quick-reference/Makefile
- doc/es/_static/es/bzr-es-quick-reference.pdf => doc/es/quick-reference/quick-start-summary.pdf
- doc/es/_static/es/bzr-es-quick-reference.png => doc/es/quick-reference/quick-start-summary.png
- doc/es/_static/es/bzr-es-quick-reference.svg => doc/es/quick-reference/quick-start-summary.svg
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- doc/es/index.txt => doc/index.es.txt
- doc/ru/index.txt => doc/index.ru.txt
- doc/en/make.bat => doc/make.bat
- doc/ru/_static/ru/Makefile => doc/ru/quick-reference/Makefile
- doc/ru/_static/ru/bzr-ru-quick-reference.pdf => doc/ru/quick-reference/quick-start-summary.pdf
- doc/ru/_static/ru/bzr-ru-quick-reference.png => doc/ru/quick-reference/quick-start-summary.png
- doc/ru/_static/ru/bzr-ru-quick-reference.svg => doc/ru/quick-reference/quick-start-summary.svg
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/Bazaar-Logo-For-Manuals.png
doc/_static/en/quick-reference/bzr-quick-reference.svg
doc/developers/_static/bzr icon 16.png
doc/es/_static/bzr icon 16.png
doc/es/quick-reference/quick-start-summary.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/quick-reference/quick-start-summary.svg
