Viewing all changes in revision 5247.1.15.
- Committer: Vincent Ladeuil
- Date: 2010-08-24 12:33:26 UTC
- mfrom: (5273.1.14 cleanup)
- mto: (5247.5.34 propagate-exceptions)
- mto: This revision was merged to the branch mainline in revision 5396.
- Revision ID: v.ladeuil+lp@free.fr-20100824123326-pnhdo6z5e5y9y0tb
Merge cleanup into first-try resolving conflicts
- files added:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files renamed:
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- files modified:
- NEWS
expand all
collapse all
added
removed
