Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 08:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into topic/jsiwek/faf-updates

Browse source 
Conflicts:
	magic
This commit is contained in:
Jon Siwek 2013-07-25 10:02:26 -05:00
commit ac6b12b5d4
21 changed files with 158 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/file_analysis/Component.h
View file

@ -64,7 +64,7 @@ public:
* from what's passed to the constructor but upper-cased and
* canonified to allow being part of a script-level ID.
*/
const char* Name() const { return name; }
virtual const char* Name() const { return name; }
/**
* Returns a canonocalized version of the analyzer's name. The