Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3

Browse source 
Conflicts:
	aux/btest
This commit is contained in:
Robin Sommer 2014-07-22 20:27:00 -07:00
commit c6e204fbe2
16 changed files with 90920 additions and 79647 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/base/init-bare.bro
View file

@ -2738,6 +2738,7 @@ type ModbusRegisters: vector of count;
type ModbusHeaders: record {
tid: count;
pid: count;
len: count;
uid: count;
function_code: count;
};