From: Matthew Barr <matthew.barr@intel.com>
Date: Fri, 2 Dec 2016 00:21:29 +0000 (+1100)
Subject: Merge master into develop
X-Git-Tag: v4.4.0^2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be8bd41ec411378505de1ae050c0f6ea4ae0f385;p=thirdparty%2Fvectorscan.git

Merge master into develop
---

be8bd41ec411378505de1ae050c0f6ea4ae0f385
diff --cc CMakeLists.txt
index c9a6f8db,842834a1..6f506e9b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -3,9 -7,13 +3,9 @@@ project (Hyperscan C CXX
  
  set (HS_MAJOR_VERSION 4)
  set (HS_MINOR_VERSION 3)
- set (HS_PATCH_VERSION 1)
+ set (HS_PATCH_VERSION 2)
  set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION})
  
 -# since we are doing this manually, we only have three types
 -set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo"
 -     CACHE STRING "" FORCE)
 -
  set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
  include(CheckCCompilerFlag)
  include(CheckCXXCompilerFlag)