From: Josh <jrosenba@cisco.com>
Date: Fri, 13 Jun 2014 15:16:33 +0000 (-0400)
Subject: Codecs merging with master branch
X-Git-Tag: 3.0.0-233~1481^2~1^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a85f1eb008e6f0dbac107366366ec5aecda4fad8;p=thirdparty%2Fsnort3.git

Codecs merging with master branch
---

a85f1eb008e6f0dbac107366366ec5aecda4fad8
diff --cc src/codecs/Makefile.am
index 8a85b6d14,226204aca..529664c0c
--- a/src/codecs/Makefile.am
+++ b/src/codecs/Makefile.am
@@@ -11,8 -11,7 +11,8 @@@ sf_protocols.
  libcodecs_a_SOURCES = \
  codec_api.cc \
  codec_api.h \
- decode_module.h \
+ decode_module.h
 +sf_protocols.h
  
  libcodec_utils_a_SOURCES = \
  codec_events.cc \