Viewing all changes in revision 4869.3.20.
- Committer: Andrew Bennetts
- Date: 2010-01-15 03:58:20 UTC
- mfrom: (4963 +trunk)
- mto: (4973.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4975.
- Revision ID: andrew.bennetts@canonical.com-20100115035820-ilb3t36swgzq6v1l
Merge lp:bzr.
- files added:
- MANIFEST.in
- bzrlib/help_topics/es
- contrib/debian
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflicts.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- files modified:
- Makefile
expand all
collapse all
added
removed
