Copy changes from dev-branch into main

History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad committed 2023-10-23 09:26:33 +02:00
1 parent 5688838899
commit 06f9c6126d
1778 files changed
+35036 -12457

No files matched your search

@@ -181,7 +181,7 @@ void RimColorLegendCollection::createStandardColorLegends()
m_standardColorLegends.push_back( createRockTypeColorLegend() );
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------