From: Russ Combs <rucombs@cisco.com>
Date: Thu, 6 Nov 2014 13:24:32 +0000 (-0500)
Subject: update
X-Git-Tag: 3.0.0-233~1261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f2232fe839ca7ee5878238f34b141ccf670fcc8;p=thirdparty%2Fsnort3.git

update
---

2f2232fe839ca7ee5878238f34b141ccf670fcc8
diff --cc ChangeLog
index 3d040d151,c658cb47e..39578b730
--- a/ChangeLog
+++ b/ChangeLog
@@@ -31,7 -31,7 +31,8 @@@
  -- latest from Josh
  -- initial /* comments */ for text rules (needs to ignore \")
  -- latest from Josh
+ -- added --c2x and --x2c since i'm tired of looking this stuff up!
 +-- added hi event squelch
  
  126
  -- pulled latest from tom