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

This commit is contained in:
Magne Sjaastad 2020-01-28 21:42:18 +01:00
commit df746ff2f5

View File

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