Merge branch 'master' into dev after patch release

This commit is contained in:
Magne Sjaastad 2018-02-22 09:34:44 +01:00
commit 814c55f849

View File

@ -1,7 +1,7 @@
set(RESINSIGHT_MAJOR_VERSION 2018)
set(RESINSIGHT_MINOR_VERSION 01)
set(RESINSIGHT_PATCH_VERSION 00)
set(RESINSIGHT_PATCH_VERSION 1)
# Opional text with no restrictions
set(RESINSIGHT_VERSION_TEXT "-dev")