Viewing all changes in revision 4597.6.2.
- Committer: Vincent Ladeuil
- Date: 2010-01-16 10:06:21 UTC
- mfrom: (4597.2.19 cleanup)
- mto: (4597.3.66 dont-add-conflict-helpers)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100116100621-bd1a825l980jgwzm
Merge cleanup into description
- files added:
- MANIFEST.in
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- files modified:
- Makefile
expand all
collapse all
added
removed
