Viewing all changes in revision 5718.9.2.
- Committer: Jelmer Vernooij
- Date: 2011-05-10 07:46:15 UTC
- mfrom: (5844 +trunk)
- mto: This revision was merged to the branch mainline in revision 5845.
- Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.
- files added:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/bzr_distutils.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- po
- files renamed:
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- files modified:
- Makefile
expand all
collapse all
added
removed
