Merge remote branch 'origin/V8_5_asterstudy'

author vsr <vsr@opencascade.com>

Wed, 12 Sep 2018 06:25:28 +0000 (09:25 +0300)

committer vsr <vsr@opencascade.com>

Wed, 12 Sep 2018 06:25:28 +0000 (09:25 +0300)
author vsr <vsr@opencascade.com>
Wed, 12 Sep 2018 06:25:28 +0000 (09:25 +0300)
committer vsr <vsr@opencascade.com>
Wed, 12 Sep 2018 06:25:28 +0000 (09:25 +0300)
diff --cc src/SALOME_SWIG/SALOMEGUI_Swig.cxx
Simple merge
diff --cc src/SALOME_SWIG/SALOMEGUI_Swig.hxx
Simple merge
diff --cc src/SALOME_SWIG/SALOMEGUI_Swig.i
Simple merge
diff --cc src/SVTK/SVTK_ViewWindow.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Wed, 12 Sep 2018 06:25:28 +0000 (09:25 +0300)
committer	vsr <vsr@opencascade.com>
	Wed, 12 Sep 2018 06:25:28 +0000 (09:25 +0300)
		1	2
src/SALOME_SWIG/SALOMEGUI_Swig.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/SALOME_SWIG/SALOMEGUI_Swig.hxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/SALOME_SWIG/SALOMEGUI_Swig.i	patch \|	diff1 \|	diff2 \|	blob \| history
src/SVTK/SVTK_ViewWindow.cxx	patch \|	diff1 \|	diff2 \|	blob \| history