Gregor Maier b0ac4882bd Merge branch 'master' into topic/gregor/tunnel ... * master: (21 commits) Fixing default policy search path. Small tweaks for doc generation. The hostname notice email extension now only add hostnames for emailed noticed. Attempt at cleaning up doc generation. Hopefully the last major script reorganization. Updating submodule(s). Fixing compiler warning. Fixing crash in memory profiling. Fix compiler warning. Fixing memory (and CPU) leak in log writer. Fixing missing sync in cluster setup. Update script doc-generation README. Omission of bro.init from doc generation fixed. Fixing docstrings to make docutils happy. Updated submodules to current master Updating submodule(s). Updating submodule(s). Fix genDocSourcesList script lack of explicit sorting Fix &raw_output and enable_raw_output interpretation of NUL characters Fix PktSrc::Statistics returning bogus stats. ... Conflicts: scripts/base/bro.init		2011-08-07 09:59:30 -07:00
..
base	Merge branch 'master' into topic/gregor/tunnel	2011-08-07 09:59:30 -07:00
policy	Merge branch 'master' of ssh://git.bro-ids.org/bro	2011-08-05 23:11:40 -04:00
site	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
CMakeLists.txt	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
test-all.bro	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00