« back to all changes in this revision
Viewing changes to bzrlib/benchmarks/bench_bench.py
- Committer: Andrew Bennetts
- Date: 2010-02-12 04:33:05 UTC
- mfrom: (5031 +trunk)
- mto: This revision was merged to the branch mainline in revision 5032.
- Revision ID: andrew.bennetts@canonical.com-20100212043305-ujdbsdoviql2t7i3
Merge lp:bzr
- files added:
- MANIFEST.in
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- contrib/apport
- contrib/debian
- 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
- files removed:
- bzrlib/textui.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_bench.py
