[Bro-Dev] #543: Bro autodoc after script reorganization

Bro Tracker bro at tracker.bro-ids.org
Sat Aug 13 07:47:38 PDT 2011


#543: Bro autodoc after script reorganization
----------------------------+------------------------
  Reporter:  gregor         |      Owner:  jsiwek
      Type:  Merge Request  |     Status:  assigned
  Priority:  Normal         |  Milestone:  Bro1.6
 Component:  Bro            |    Version:  git/master
Resolution:                 |   Keywords:  autodoc
----------------------------+------------------------

Comment (by jsiwek):

 Replying to [comment:4 robin]:
 > This gives me a number of conflicts when merging, and for some I'm not
 sure what the right version is now. Please merge master into the branch
 and adapt as necessary.

 These are fixed in the branch now.

-- 
Ticket URL: <http://tracker.bro-ids.org/bro/ticket/543#comment:5>
Bro Tracker <http://tracker.bro-ids.org/bro>
Bro Issue Tracker



More information about the bro-dev mailing list