From: Russ Combs <rucombs@cisco.com>
Date: Tue, 7 Oct 2014 17:38:38 +0000 (-0400)
Subject: update change log
X-Git-Tag: 3.0.0-233~1383^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73aaa0c35ca50df46b0bb0fdfd7a96cba861b598;p=thirdparty%2Fsnort3.git

update change log
---

diff --git a/ChangeLog b/ChangeLog
index 05f7d8c0c..94ac4b497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@
 -- added snort.detach() and fixed -j parsing
 -- various parsing changes for improved error handling
 -- fixed some Xcode analyzer issues
+-- pulled in cmake updates from Josh
+-- pulled in nhttp updates from Tom
 
 122
 -- pulled thread pinning from Josh