To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4936.1.3.
- Committer: Andrew Bennetts
- Date: 2010-01-13 23:16:20 UTC
- mfrom: (4957 +trunk)
- mto: This revision was merged to the branch mainline in revision 4960.
- Revision ID: andrew.bennetts@canonical.com-20100113231620-n6in2yjib2v6z03g
Merge lp:bzr.
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- files modified:
- Makefile
expand all
collapse all
added
removed
