Merge branch 'master' into dev

This commit is contained in:
Magne Sjaastad 2018-05-25 11:34:54 +02:00
commit 40e9151069

View File

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