]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
projects / thirdparty / snort3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7495738 14af470)
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
authorRuss Combs <rucombs@cisco.com>
Tue, 22 Jul 2014 14:04:34 +0000 (10:04 -0400)
committerRuss Combs <rucombs@cisco.com>
Tue, 22 Jul 2014 14:04:34 +0000 (10:04 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/main/modules.cc patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/main/modules.cc
Simple merge
Mirror of https://github.com/snort3/snort3.git