Merge branch 'occ/19960'

author vsr <vsr@opencascade.com>

Mon, 15 Feb 2021 11:16:48 +0000 (14:16 +0300)

committer vsr <vsr@opencascade.com>

Mon, 15 Feb 2021 11:16:48 +0000 (14:16 +0300)
author vsr <vsr@opencascade.com>
Mon, 15 Feb 2021 11:16:48 +0000 (14:16 +0300)
committer vsr <vsr@opencascade.com>
Mon, 15 Feb 2021 11:16:48 +0000 (14:16 +0300)
diff --cc src/SHAPERGUI/SHAPERGUI.cpp
Simple merge
author	vsr <vsr@opencascade.com>
	Mon, 15 Feb 2021 11:16:48 +0000 (14:16 +0300)
committer	vsr <vsr@opencascade.com>
	Mon, 15 Feb 2021 11:16:48 +0000 (14:16 +0300)