Merge branch 'occ/shaper2smesh'

author vsr <vsr@opencascade.com>

Fri, 21 Feb 2020 11:49:45 +0000 (14:49 +0300)

committer vsr <vsr@opencascade.com>

Fri, 21 Feb 2020 11:49:45 +0000 (14:49 +0300)
author vsr <vsr@opencascade.com>
Fri, 21 Feb 2020 11:49:45 +0000 (14:49 +0300)
committer vsr <vsr@opencascade.com>
Fri, 21 Feb 2020 11:49:45 +0000 (14:49 +0300)
diff --cc src/SalomeApp/resources/SalomeApp.xml
Simple merge
author	vsr <vsr@opencascade.com>
	Fri, 21 Feb 2020 11:49:45 +0000 (14:49 +0300)
committer	vsr <vsr@opencascade.com>
	Fri, 21 Feb 2020 11:49:45 +0000 (14:49 +0300)