To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4869.3.20.
-
Committer:
Andrew Bennetts
-
Date:
2010-01-15 03:58:20 UTC
-
mfrom:
(4963 +trunk)
-
mto:
(4973.1.1 integration)
-
mto:
This revision was merged to the branch mainline in
revision
4975.
-
Revision ID:
andrew.bennetts@canonical.com-20100115035820-ilb3t36swgzq6v1l
Merge lp:bzr.
- files added:
-
bzrlib/help_topics/es
-
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
-
bzrlib/plugins/news_merge/
=>
contrib/news_merge/
expand all
collapse all
Show diffs side-by-side
added
removed