Merge branch 'rnv/win_9_2' into V9_2_BR

author vsr <vsr@opencascade.com>

Fri, 18 Jan 2019 12:15:47 +0000 (15:15 +0300)

committer vsr <vsr@opencascade.com>

Fri, 18 Jan 2019 12:15:47 +0000 (15:15 +0300)
author vsr <vsr@opencascade.com>
Fri, 18 Jan 2019 12:15:47 +0000 (15:15 +0300)
committer vsr <vsr@opencascade.com>
Fri, 18 Jan 2019 12:15:47 +0000 (15:15 +0300)
diff --cc src/SalomeApp/SalomeApp_Application.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Fri, 18 Jan 2019 12:15:47 +0000 (15:15 +0300)
committer	vsr <vsr@opencascade.com>
	Fri, 18 Jan 2019 12:15:47 +0000 (15:15 +0300)