« back to all changes in this revision
Viewing changes to bzrlib/benchmarks/bench_inventory.py
- Committer: Jelmer Vernooij
- Date: 2010-03-21 21:39:33 UTC
- mfrom: (5102 +trunk)
- mto: This revision was merged to the branch mainline in revision 5143.
- Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.
- files added:
- .testr.conf
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- contrib/apport
- doc/en/whats-new
- files removed:
- bzrlib/weave_commands.py
- 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
- files modified:
- INSTALL
added
removed
bzrlib/benchmarks/bench_inventory.py
