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

This commit is contained in:
Magne Sjaastad 2021-11-01 15:08:12 +01:00
commit b3e0279f3a

View File

@ -130,7 +130,7 @@ RiaPreferencesSummary::RiaPreferencesSummary()
CAF_PDM_InitField( &m_createH5SummaryDataFile, CAF_PDM_InitField( &m_createH5SummaryDataFile,
"createH5SummaryDataFile", "createH5SummaryDataFile",
false, true,
"Create h5 Summary Files", "Create h5 Summary Files",
"", "",
"If not present, create summary file with extension '*.h5'", "If not present, create summary file with extension '*.h5'",
@ -139,7 +139,7 @@ RiaPreferencesSummary::RiaPreferencesSummary()
CAF_PDM_InitField( &m_checkH5FileTimeStamp, CAF_PDM_InitField( &m_checkH5FileTimeStamp,
"checkH5FileTimeStamp", "checkH5FileTimeStamp",
false, true,
"Check File Timestamp", "Check File Timestamp",
"", "",
"Compare timestamp of h5 and SMSPEC, and recreate h5 when required", "Compare timestamp of h5 and SMSPEC, and recreate h5 when required",