]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort...
authorhuica <huica@cisco.com>
Wed, 9 Sep 2015 20:02:18 +0000 (16:02 -0400)
committerhuica <huica@cisco.com>
Wed, 9 Sep 2015 20:02:18 +0000 (16:02 -0400)
1  2 
configure.ac
src/Makefile.am

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