Viewing all changes in revision 158.
- Committer: Max Bowsher
- Date: 2012-03-11 00:18:38 UTC
- mfrom: (144.1.23 natty)
- Revision ID: _@maxb.eu-20120311001838-orc0v5vksuqp0431
Merge 2.5
- files added:
- bzrlib/_annotator_pyx.c
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- debian/tests
- files removed:
- bzrlib/_annotator_pyx.c
- 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
- .bzr-builddeb/default.conf => debian/bzr-builddeb.conf
- files modified:
- Makefile
expand all
collapse all
added
removed
