From: Russ Combs <rucombs@cisco.com>
Date: Thu, 16 Oct 2014 18:25:55 +0000 (-0400)
Subject: update changelog
X-Git-Tag: 3.0.0-233~1369
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3a96cf5076ce57742aad89d3ff6874e369d2535;p=thirdparty%2Fsnort3.git

update changelog
---

diff --git a/ChangeLog b/ChangeLog
index 814196e9c..545dea7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
    unprotected so rules
 -- latest from tom
 -- fixed explicit stream_* bindings
+-- latest from josh - snort2lua changes
 
 124
 -- valgrind cleanup
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9faa1cf8d..1d18c8a76 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -41,8 +41,6 @@ style.txt \
 terms.txt \
 images/snort.png
 
-
-
 all_sources = \
 $(unbuilt_sources) \
 $(BUILT_SOURCES)