Viewing all changes in revision 5268.7.28.
- Committer: Jelmer Vernooij
- Date: 2011-08-15 16:37:57 UTC
- mfrom: (6071 +trunk)
- mto: (5268.8.2 switch-colocated)
- mto: This revision was merged to the branch mainline in revision 6079.
- Revision ID: jelmer@samba.org-20110815163757-kjj0o219m5hxhkef
merge bzr.dev
- files added:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files renamed:
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/bzr_distutils.py => tools/build_mo.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/en/_static/en/bzr-en-quick-reference.svg
doc/es/_static/es/bzr-es-quick-reference.svg
doc/ru/_static/ru/bzr-ru-quick-reference.svg
