« back to all changes in this revision
Viewing changes to bzrlib/cleanup.py
- Committer: Vincent Ladeuil
- Date: 2016-01-22 08:02:12 UTC
- mfrom: (6612 +trunk)
- mto: This revision was merged to the branch mainline in revision 6613.
- Revision ID: v.ladeuil+lp@free.fr-20160122080212-iz2fcz6n0su5px7g
Merge trunk resolving conflicts
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- .bzrignore
added
removed
bzrlib/cleanup.py
