Merge master into develop

This commit is contained in:
Matthew Barr
2016-12-02 11:21:29 +11:00
4 changed files with 36 additions and 3 deletions

View File

@@ -3,7 +3,7 @@ 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})
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)