Jon Siwek 2a9ea6b8ba Merge branch 'master' into topic/jsiwek/autodoc-fixes ... Conflicts: scripts/CMakeLists.txt scripts/base/frameworks/cluster/setup-connections.bro scripts/base/frameworks/communication/__load__.bro scripts/base/frameworks/metrics/conn-example.bro scripts/base/frameworks/metrics/http-example.bro scripts/site/local.bro		2011-08-13 09:31:06 -05:00
..
actions	Merge branch 'master' into topic/jsiwek/autodoc-fixes	2011-08-13 09:31:06 -05:00
extend-email	Single character bugfix for hostname notice email extension.	2011-08-11 15:16:32 -04:00
__load__.bro	Small updates for notice framework.	2011-08-11 14:59:01 -04:00
main.bro	Merge branch 'master' of ssh://git.bro-ids.org/bro	2011-08-05 23:11:40 -04:00
weird.bro	Fixes for script auto-documentation.	2011-08-08 19:50:45 -05:00