From: Russ Combs <rucombs@cisco.com>
Date: Thu, 21 Aug 2014 16:10:00 +0000 (-0400)
Subject: 115
X-Git-Tag: 3.0.0-233~1419^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0096bd2eae298235efd27c9fcae84b39009c8152;p=thirdparty%2Fsnort3.git

115
---

diff --git a/ChangeLog b/ChangeLog
index 3ed8bf60c..b373b3ba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 -- misc FIXITs
 -- refactored cmd line parsing and moved options to SnortModule
 -- prioritized all FIXITs; FIXIT-J are for josh to reprioritize
+-- got latest from Josh
 
 114
 -- more FIXIT cleanup
diff --git a/configure.ac b/configure.ac
index 800bdb067..8aff6e50e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@
 # initialization
 #--------------------------------------------------------------------------
 
-AC_INIT([snort], [2.10.114])
+AC_INIT([snort], [2.10.115])
 AC_PREREQ([2.68])
 
 AC_CONFIG_SRCDIR([src/main.h])