Merge branch 'master' into topic/robin/bloom-filter-merge

This commit is contained in:
Robin Sommer 2013-07-25 10:18:46 -07:00
commit b97e045c9a
13 changed files with 55 additions and 36 deletions

View file

@ -13,7 +13,6 @@ set(probabilistic_SRCS
Hasher.cc)
bif_target(bloom-filter.bif)
bro_add_subdir_library(probabilistic ${probabilistic_SRCS} ${BIF_OUTPUT_CC})
bro_add_subdir_library(probabilistic ${probabilistic_SRCS})
add_dependencies(bro_probabilistic generate_outputs)