Viewing all changes in revision 6111.3.11.
- Committer: Martin Packman
- Date: 2012-01-05 09:50:04 UTC
- mfrom: (6424 +trunk)
- mto: This revision was merged to the branch mainline in revision 6426.
- Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- 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:
- Makefile
expand all
collapse all
added
removed
