Viewing all changes in revision 4988.6.2.
- Committer: Jelmer Vernooij
- Date: 2010-02-01 11:40:56 UTC
- mfrom: (4988.5.3 private-get-inventory-xml)
- mto: This revision was merged to the branch mainline in revision 4995.
- Revision ID: jelmer@samba.org-20100201114056-4ok3hzhisdxvhu2m
Merge bzr.dev.
- files added:
- bzrlib/help_topics/es
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/help_topics/es
- contrib/apport
- files renamed:
- bzrlib/help_topics/es/conflict-types.txt => bzrlib/help_topics/es/conflicts.txt
- files modified:
- Makefile
expand all
collapse all
added
removed
