Viewing all changes in revision 6015.42.8.
- Committer: Vincent Ladeuil
- Date: 2011-11-24 15:48:29 UTC
- mfrom: (6289 +trunk)
- mto: This revision was merged to the branch mainline in revision 6337.
- Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts
- files added:
- bzrlib/estimate_compressed_size.py
- files removed:
- bzrlib/tests/per_repository/test_fileid_involved.py
- 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:
- bzr
expand all
collapse all
added
removed
