Viewing all changes in revision 6159.2.5.
- Committer: Jelmer Vernooij
- Date: 2012-01-30 14:12:36 UTC
- mfrom: (6437.3.28 2.5)
- mto: This revision was merged to the branch mainline in revision 6522.
- Revision ID: jelmer@samba.org-20120130141236-66k8qj1he6q2nq3r
Merge 2.5 branch.
- files added:
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- files modified:
- Makefile
expand all
collapse all
added
removed
