Merge V9_dev branch into master

author rnv <rnv@opencascade.com>

Thu, 7 Jun 2018 12:36:04 +0000 (15:36 +0300)

committer rnv <rnv@opencascade.com>

Thu, 14 Jun 2018 11:48:58 +0000 (14:48 +0300)
author rnv <rnv@opencascade.com>
Thu, 7 Jun 2018 12:36:04 +0000 (15:36 +0300)
committer rnv <rnv@opencascade.com>
Thu, 14 Jun 2018 11:48:58 +0000 (14:48 +0300)
diff --cc src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
Simple merge
diff --cc src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx
Simple merge
diff --cc src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.hxx
Simple merge
author	rnv <rnv@opencascade.com>
	Thu, 7 Jun 2018 12:36:04 +0000 (15:36 +0300)
committer	rnv <rnv@opencascade.com>
	Thu, 14 Jun 2018 11:48:58 +0000 (14:48 +0300)
		1	2
src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.hxx	patch \|	diff1 \|	diff2 \|	blob \| history