~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 4949.1.1.
-
Committer:
Martin Pool
-
Date:
2010-01-12 06:30:41 UTC
-
mfrom:
(4634.119.3 2.0)
-
mto:
This revision was merged to the branch mainline in
revision
4951.
-
Revision ID:
mbp@sourcefrog.net-20100112063041-qp2ei0clx5gh0e9e
merge 2.0 back to trunk
- 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