Robin Sommer a646fde884 Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge ... * origin/topic/seth/unified2-analyzer: Fixed a problem where the Unified2 analyzer was attached to every file. Fixing intel framework tests. Updating submodule(s). Add file name support to intel framework. Add file support to intel framework and slightly restructure intel http handling. Conflicts: CHANGES VERSION scripts/base/files/unified2/main.bro testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log		2013-08-14 10:27:26 -07:00
..
files	Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge	2013-08-14 10:27:26 -07:00
frameworks	Fixing intel framework tests.	2013-08-13 23:49:39 -04:00
misc	Merge remote-tracking branch 'origin/fastpath'	2012-12-14 14:34:51 -08:00
protocols	Merge branch 'topic/robin/dnp3-merge-v3'	2013-08-12 11:39:03 -07:00
utils	Fixed some tests.	2013-08-12 15:31:31 -04:00
init-bare.bro	Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer'	2013-08-13 18:37:52 -07:00
init-default.bro	Merge remote-tracking branch 'origin/master' into topic/seth/unified2-analyzer	2013-08-14 00:54:41 -04:00