]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #472 in SNORT/snort3 from filecapture to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 10 May 2016 18:47:50 +0000 (14:47 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 10 May 2016 18:47:50 +0000 (14:47 -0400)
* commit '3aaa5bdc3510b65c79cdb9d6439d557d9b653be7':
  update Cmake file
  Fix the link error in automake
  Add file_module file
  move file module to file api

1  2 
src/CMakeLists.txt
src/Makefile.am

Simple merge
diff --cc src/Makefile.am
Simple merge