« back to all changes in this revision
Viewing changes to bzrlib/plugins/news_merge/
- Committer: Aaron Bentley
- Date: 2006-08-28 21:17:21 UTC
- mfrom: (1965 +trunk)
- mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 1966.
- Revision ID: abentley@panoramicfeedback.com-20060828211721-4723e2ef91dd2df4
Merge bzr.dev (and fix NEWS)
- files added:
- bzrlib/tests/blackbox/test_locale.py
- files modified:
- NEWS
added
removed
bzrlib/plugins/news_merge/
