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 branch 'master' of ssh://git.bro-ids.org/bro

Browse source
This commit is contained in:
Seth Hall 2011-10-21 22:41:53 -04:00
commit 9413e7f58c
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -45,7 +45,7 @@ bindist:
./make-rpm-packages ) ) ./make-rpm-packages ) )
distclean: distclean:
git reset --hard HEAD && git clean -xdf rm -rf $(BUILD)
configured: configured:
@test -d $(BUILD) || ( echo "Error: No build/ directory found. Did you run configure?" && exit 1 ) @test -d $(BUILD) || ( echo "Error: No build/ directory found. Did you run configure?" && exit 1 )

2
aux/binpac

@ -1 +1 @@
Subproject commit c8760bd06861e2cfe9a4bc652fb634a6f6422ea6 Subproject commit 1aa1fbc198107fed0e84f14ea5fd65b7d4bb76d2

2
aux/bro-aux

@ -1 +1 @@
Subproject commit c0b0d58bc60c006445aa767fcc0ce09b3d317a36 Subproject commit 8b26ea344f65c3e8fe9f48b1928d8350ee1b6e4a

2
aux/broccoli

@ -1 +1 @@
Subproject commit 32233c4459d5196712b7f8de7b85875cc91d4c3a Subproject commit 71df6ced17929153bd6dabccd9e1a2bf9f13f710

2
aux/broctl

@ -1 +1 @@
Subproject commit 44797ae8a21adcb478dcea63526d8ff4063785e8 Subproject commit 7360369bd36860344a896335638d5e53da7d3422

2
doc/upgrade.rst
View file

@ -39,7 +39,7 @@ version. The two rules of thumb are:
if you need help. if you need help.
Below we summarize changes from 1.x to 2.x in more detail. This list Below we summarize changes from 1.x to 2.x in more detail. This list
isn't complete, see the `CHANGES <{{git("bro:CHANGES")}}>`_ file in the isn't complete, see the `CHANGES <{{git('bro:CHANGES', 'txt')}}>`_ file in the
distribution for the full story. distribution for the full story.
Default Scripts Default Scripts