Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/gui

author rnv <rnv@opencascade.com>

Thu, 14 Jun 2018 11:42:35 +0000 (14:42 +0300)

committer rnv <rnv@opencascade.com>

Thu, 14 Jun 2018 11:42:35 +0000 (14:42 +0300)
author rnv <rnv@opencascade.com>
Thu, 14 Jun 2018 11:42:35 +0000 (14:42 +0300)
committer rnv <rnv@opencascade.com>
Thu, 14 Jun 2018 11:42:35 +0000 (14:42 +0300)
diff --cc src/STD/STD_Application.cxx
Simple merge
author	rnv <rnv@opencascade.com>
	Thu, 14 Jun 2018 11:42:35 +0000 (14:42 +0300)
committer	rnv <rnv@opencascade.com>
	Thu, 14 Jun 2018 11:42:35 +0000 (14:42 +0300)