]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
projects / thirdparty / snort3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a93823a 783a2f0)
Merge pull request #435 in SNORT/snort3 from ~JOCORNET/snort3:refactor_extras to...
authorRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 27 Apr 2016 19:34:49 +0000 (15:34 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 27 Apr 2016 19:34:49 +0000 (15:34 -0400)
* commit '783a2f028723b9a7b5f5c58f35d1d50e5c922adc':
  fixed merge conflicts
  fix merge conflicts in extra
  rename examples -> src
  rename examples -> src
  re-added extra/COPYING
  updated snort email address in configure.ac
  updated LICENSE + README
  merged in changes
  fixed make distcheck, cmake & make install
  imported refactored extras
  rebased from master


Trivial merge
Mirror of https://github.com/snort3/snort3.git