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
..
__load__.bro	Finished work on unified2 analyzer.	2013-08-13 03:21:43 -04:00
main.bro	Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge	2013-08-14 10:27:26 -07:00