From: huica <huica@cisco.com>
Date: Tue, 4 Aug 2015 12:55:02 +0000 (-0400)
Subject: Merge branch 'master' of
X-Git-Tag: 3.0.0-233~828^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6002dc8d81e08737b762d67676cb40f9bbd7bb2;p=thirdparty%2Fsnort3.git

Merge branch 'master' of
ssh://huica@chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into
fileclass2

Conflicts:
	src/file_api/file_mime_process.h
---

c6002dc8d81e08737b762d67676cb40f9bbd7bb2
diff --cc src/service_inspectors/http_inspect/hi_ui_config.h
index 6adc0d8a2,2e937f1a7..98ab8f15d
--- a/src/service_inspectors/http_inspect/hi_ui_config.h
+++ b/src/service_inspectors/http_inspect/hi_ui_config.h
@@@ -34,10 -34,8 +34,9 @@@
  #define HI_UI_CONFIG_H
  
  #include "hi_include.h"
- #include "hi_util_kmap.h"
  #include "sfrt/sfrt.h"
  #include "sfip/sf_ip.h"
 +#include "file_api/file_mime_process.h"
  #include "file_api/file_api.h"
  #include "decompress/file_decomp.h"
  #include "framework/bits.h"