From: Josh <jrosenba@cisco.com>
Date: Thu, 1 May 2014 14:59:53 +0000 (-0400)
Subject: merge with Russ
X-Git-Tag: 3.0.0-233~1541
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1373a56e40bebf69734a21af23865698ea16d3a4;p=thirdparty%2Fsnort3.git

merge with Russ
---

1373a56e40bebf69734a21af23865698ea16d3a4
diff --cc src/codecs/basic/Makefile.am
index a71d727c5,c407f3415..029125b10
--- a/src/codecs/basic/Makefile.am
+++ b/src/codecs/basic/Makefile.am
@@@ -9,9 -9,9 +9,10 @@@ cd_icmp4.cc 
  cd_icmp6.cc \
  cd_ipv4.cc \
  cd_ipv6.cc \
+ cd_null.cc \
  cd_tcp.cc \
 -cd_udp.cc
 +cd_udp.cc \
 +cd_null.cc
  
  AM_CXXFLAGS = @AM_CXXFLAGS@