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

Fixing rebase relicts.

Browse source
This commit is contained in:
Robin Sommer 2013-12-11 20:55:17 -08:00
parent 93d9dde969
commit 61ee2b9172
2 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CMakeLists.txt
View file

@ -151,7 +151,6 @@ list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}")
set(bro_SUBDIR_LIBS CACHE INTERNAL "subdir libraries" FORCE) set(bro_SUBDIR_LIBS CACHE INTERNAL "subdir libraries" FORCE)
set(bro_PLUGIN_LIBS CACHE INTERNAL "plugin libraries" FORCE) set(bro_PLUGIN_LIBS CACHE INTERNAL "plugin libraries" FORCE)
add_subdirectory(iosource)
add_subdirectory(analyzer) add_subdirectory(analyzer)
add_subdirectory(file_analysis) add_subdirectory(file_analysis)
add_subdirectory(probabilistic) add_subdirectory(probabilistic)
@ -251,8 +250,6 @@ set(bro_SRCS
Anon.cc Anon.cc
Attr.cc Attr.cc
Base64.cc Base64.cc
BroDoc.cc
BroDocObj.cc
Brofiler.cc Brofiler.cc
BroString.cc BroString.cc
CCL.cc CCL.cc

4
src/Net.h
View file

@ -4,11 +4,7 @@
#define net_h #define net_h
#include "net_util.h" #include "net_util.h"
<<<<<<< HEAD
#include "util.h" #include "util.h"
#include "BPF_Program.h"
=======
>>>>>>> 5493253... Checkpoint.
#include "List.h" #include "List.h"
#include "FlowSrc.h" #include "FlowSrc.h"
#include "Func.h" #include "Func.h"