← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hooks.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hooks.py
59
59
    ('bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilder.hooks'),
60
60
    'bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilderHooks')
61
61
known_hooks.register_lazy(
62
 
    ('bzrlib.merge_directive', '_BaseMergeDirective.hooks'),
 
62
    ('bzrlib.merge_directive', 'BaseMergeDirective.hooks'),
63
63
    'bzrlib.merge_directive', 'MergeDirectiveHooks')
64
64
 
65
65