To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 3984.5.21.
-
Committer:
Andrew Bennetts
-
Date:
2010-01-15 04:05:36 UTC
-
mfrom:
(4963 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
4964.
-
Revision ID:
andrew.bennetts@canonical.com-20100115040536-9l6iz5an8tqq9ny7
Merge lp:bzr.
- files added:
-
bzrlib/help_topics/es
-
bzrlib/plugins/news_merge
-
bzrlib/plugins/news_merge/tests
-
bzrlib/tests/per_bzrdir_colo
- files renamed:
-
bzrlib/help_topics/es/conflict-types.txt
=>
bzrlib/help_topics/es/conflicts.txt
expand all
collapse all
Show diffs side-by-side
added
removed