Viewing all changes in revision 5042.1.2.
- Committer: Neil Martinsen-Burrell
- Date: 2010-09-26 02:27:37 UTC
- mfrom: (5424 +trunk)
- mto: This revision was merged to the branch mainline in revision 5461.
- Revision ID: nmb@wartburg.edu-20100926022737-cj2qvebm2mhpjzak
merge from trunk
- files added:
- .testr.conf
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- doc/en/whats-new
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files renamed:
- contrib/apport/ => apport/
- contrib/apport/bzr.conf => apport/bzr-crashdb.conf
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => bzrlib/tests/per_controldir/test_controldir.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
