~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 6468.1.1.
-
Committer:
Jelmer Vernooij
-
Date:
2012-02-18 16:55:04 UTC
-
mfrom:
(6437.23.10 2.5)
-
mto:
This revision was merged to the branch mainline in
revision
6469.
-
Revision ID:
jelmer@samba.org-20120218165504-c9oe5c5ue805y8wp
Merge bzr/2.5.
- files added:
-
bzrlib/plugins/po_merge
-
bzrlib/plugins/po_merge/tests
expand all
collapse all
Show diffs side-by-side
added
removed