Merge multi-study removal branch.

author rnv <rnv@opencascade.com>

Thu, 8 Jun 2017 14:16:51 +0000 (17:16 +0300)

committer rnv <rnv@opencascade.com>

Thu, 8 Jun 2017 14:18:16 +0000 (17:18 +0300)
author rnv <rnv@opencascade.com>
Thu, 8 Jun 2017 14:16:51 +0000 (17:16 +0300)
committer rnv <rnv@opencascade.com>
Thu, 8 Jun 2017 14:18:16 +0000 (17:18 +0300)
diff --cc src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx
Simple merge
diff --cc src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx
Simple merge
author	rnv <rnv@opencascade.com>
	Thu, 8 Jun 2017 14:16:51 +0000 (17:16 +0300)
committer	rnv <rnv@opencascade.com>
	Thu, 8 Jun 2017 14:18:16 +0000 (17:18 +0300)
		1	2
src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx	patch \|	diff1 \|	diff2 \|	blob \| history