Robin Sommer 5e9153d7d6 Merge remote-tracking branch 'origin/topic/bernhard/notice-proto' ... * origin/topic/bernhard/notice-proto: log protocol in notices. Conflicts: scripts/base/frameworks/notice/main.bro Closes #718.		2012-01-03 14:52:07 -08:00
..
frameworks	Merge remote-tracking branch 'origin/topic/bernhard/notice-proto'	2012-01-03 14:52:07 -08:00
misc	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
protocols	Merge remote branch 'origin/topic/seth/dns-updates'	2011-12-18 15:20:00 -08:00
utils	Merge branch 'master' into topic/jsiwek/reorg-followup	2011-08-15 15:34:25 -05:00
init-bare.bro	Removed unused script code from init-bare.bro	2011-10-07 13:31:28 -04:00
init-default.bro	Metrics framework update. Mostly to make metrics work on clusters.	2011-08-15 15:57:48 -04:00