Merge remote-tracking branch 'refs/remotes/origin/main'

Browse Source

Conflicts:
	ResInsightVersion.cmake

...

This commit is contained in:

Magne Sjaastad

2023-12-11 14:02:27 +01:00

parent 445cd95186 01fa9ab807

commit 776ea1052c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available