Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into topic/vladg/smb

Browse source 
Conflicts:
	src/analyzer/protocol/smb/Plugin.cc
This commit is contained in:
Vlad Grigorescu 2014-09-24 18:38:43 -04:00
commit 6ee2ec666f
451 changed files with 105777 additions and 85781 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/NetVar.h
View file

@ -249,8 +249,6 @@ extern void init_net_var();
#include "const.bif.netvar_h"
#include "types.bif.netvar_h"
#include "event.bif.netvar_h"
#include "logging.bif.netvar_h"
#include "input.bif.netvar_h"
#include "reporter.bif.netvar_h"
#endif