From: Russ Combs <rucombs@cisco.com>
Date: Fri, 17 Oct 2014 10:41:33 +0000 (-0400)
Subject: 125
X-Git-Tag: 3.0.0-233~1360^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf48ca363efe92319b4b98f36d3ba04d58a8dc47;p=thirdparty%2Fsnort3.git

125
---

diff --git a/ChangeLog b/ChangeLog
index 0f0858b4a..86f47c7a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
 -- adding sid_18758.h back to extra/src/so_rules/ so that makes work
 -- fixed enum, select, and multi validation
 -- fixed some bogus semantic warnings from xcode
+-- update from josh
 
 124
 -- valgrind cleanup
diff --git a/src/main/build.h b/src/main/build.h
index 2ea5137d8..5f726984f 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -1 +1 @@
-#define BUILD "124"
+#define BUILD "125"