Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Magne Sjaastad 2020-05-27 15:32:36 +02:00
commit 3c055a2b89

View File

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