← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/po_merge/po_merge.py
16
16
 
17
17
"""Merge logic for po_merge plugin."""
18
18
 
 
19
from __future__ import absolute_import
19
20
 
20
21
from bzrlib import (
21
22
    config,
56
57
''')
57
58
 
58
59
 
59
 
po_dirs_option = config.Option(
 
60
po_dirs_option = config.ListOption(
60
61
        'po_merge.po_dirs', default='po,debian/po',
61
 
        from_unicode=config.list_from_store,
62
62
        help='List of dirs containing .po files that the hook applies to.')
63
63
 
64
64