To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/doc_generate/autodoc_man.py
- Committer: Martin Pool
- Date: 2010-02-09 19:04:02 UTC
- mfrom: (5010 +trunk)
- mto: This revision was merged to the branch mainline in revision 5019.
- Revision ID: mbp@canonical.com-20100209190402-2xbzrchmb4dfi2j7
Resolve conflicts with trunk
- files added:
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- contrib/apport
- files removed:
- bzrlib/help_topics/es
- files renamed:
- bzrlib/help_topics/es/conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- files modified:
- INSTALL
added
removed
bzrlib/doc_generate/autodoc_man.py
