← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hooks.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 16:19:30 UTC
  • mto: This revision was merged to the branch mainline in revision 6437.
  • Revision ID: v.ladeuil+lp@free.fr-20120105161930-bh6bwqnt9tvv902f
Tweak news entry to conflict on merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hooks.py
83
83
    ('bzrlib.smart.client', '_SmartClient.hooks', 'SmartClientHooks'),
84
84
    ('bzrlib.smart.server', 'SmartTCPServer.hooks', 'SmartServerHooks'),
85
85
    ('bzrlib.status', 'hooks', 'StatusHooks'),
86
 
    ('bzrlib.transport', 'Transport.hooks', 'TransportHooks'),
87
86
    ('bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilder.hooks',
88
87
        'RioVersionInfoBuilderHooks'),
89
88
    ('bzrlib.merge_directive', 'BaseMergeDirective.hooks',