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

This commit is contained in:
Magne Sjaastad 2022-04-05 08:37:19 +02:00
commit ca7a5d7b40

View File

@ -1,7 +1,7 @@
set(RESINSIGHT_MAJOR_VERSION 2021)
set(RESINSIGHT_MINOR_VERSION 10)
set(RESINSIGHT_PATCH_VERSION 2)
set(RESINSIGHT_PATCH_VERSION 3)
# Opional text with no restrictions
set(RESINSIGHT_VERSION_TEXT "-dev")
@ -11,7 +11,7 @@ set(RESINSIGHT_VERSION_TEXT "-dev")
# Must be unique and increasing within one combination of major/minor/patch version
# The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT
# Format of text must be ".xx"
set(RESINSIGHT_DEV_VERSION ".03")
set(RESINSIGHT_DEV_VERSION ".01")
# https://github.com/CRAVA/crava/tree/master/libs/nrlib
set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")