~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/po_merge/po_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-24 10:10:59 UTC
  • mfrom: (6405 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6407.
  • Revision ID: jelmer@samba.org-20111224101059-epghsc5y61hsgbl2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
''')
58
58
 
59
59
 
60
 
po_dirs_option = config.Option(
 
60
po_dirs_option = config.ListOption(
61
61
        'po_merge.po_dirs', default='po,debian/po',
62
 
        from_unicode=config.list_from_store,
63
62
        help='List of dirs containing .po files that the hook applies to.')
64
63
 
65
64