Viewing all changes in revision 4595.17.2.
- Committer: Martin
- Date: 2009-11-07 08:02:13 UTC
- mfrom: (4789 +trunk)
- mto: This revision was merged to the branch mainline in revision 4809.
- Revision ID: gzlist@googlemail.com-20091107080213-jad185091b3l69ih
Merge bzr.dev 4789 to resolve conflict from the disabling of plink auto-detection, and relocate NEWS
- files added:
- bzrlib/_export_c_api.h
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- doc/developers/_static
- doc/developers/_templates
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- files removed:
- doc/BUILD-NOTES
- 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/tests/test_pack_repository.py => bzrlib/tests/per_pack_repository.py
- bzrlib/tests/test_versionedfile.py => bzrlib/tests/per_versionedfile.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/es/_static/bzr icon 16.png
doc/ru/_static/bzr icon 16.png
