Bernhard Amann f6c6387c52 Merge branch 'topic/bernhard/input' into topic/bernhard/input-threads ... most stuff is inplace, logging framework needs a few changes merged before continuing here... Conflicts: src/CMakeLists.txt src/LogMgr.h src/logging/Manager.cc src/main.cc		2012-02-06 10:54:07 -08:00
..
frameworks	Merge remote-tracking branch 'origin/master' into topic/bernhard/input	2012-01-12 11:07:12 -08:00
misc	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
protocols	Merge remote-tracking branch 'origin/master' into topic/bif_cleanup	2012-01-18 14:56:53 -08:00
utils	Fix some malformed Broxygen xref roles.	2011-12-16 14:30:36 -06:00
init-bare.bro	Merge remote-tracking branch 'origin/master' into topic/bernhard/input	2012-01-12 11:07:12 -08:00
init-default.bro	Metrics framework update. Mostly to make metrics work on clusters.	2011-08-15 15:57:48 -04:00