~bzr-pqm/bzr/bzr.dev
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 added:
-
bzrlib/help_topics/es
-
bzrlib/plugins/news_merge
-
bzrlib/plugins/news_merge/tests
- 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