------------------------------------------------------------ revno: 13652 revision-id: squidadm@squid-cache.org-20141031005605-8eqt0tf2ocx6vaop parent: squid3@treenet.co.nz-20141030144830-8wh4cobaugpa6jqv committer: squidadm@squid-cache.org branch nick: 3.5 timestamp: Fri 2014-10-31 00:56:05 +0000 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20141031005605-\ # 8eqt0tf2ocx6vaop # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 1b4ea0ebe0d16c5431867e30759849b9fedc1167 # timestamp: 2014-10-31 01:29:29 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20141030144830-\ # 8wh4cobaugpa6jqv # # Begin patch === modified file 'lib/profiler/xprof_type.h' --- lib/profiler/xprof_type.h 2014-10-30 14:44:26 +0000 +++ lib/profiler/xprof_type.h 2014-10-31 00:56:05 +0000 @@ -20,7 +20,6 @@ XPROF_comm_close, XPROF_comm_connect_addr, XPROF_comm_handle_ready_fd, -+XPROF_commHandleWrite, XPROF_commHandleWrite, XPROF_comm_open, XPROF_comm_poll_normal,