Merge branch 'Dev_1.4.0' of newgeom:newgeom into Dev_1.4.0

author mpv <mpv@opencascade.com>

Fri, 4 Sep 2015 07:26:33 +0000 (10:26 +0300)

committer mpv <mpv@opencascade.com>

Fri, 4 Sep 2015 07:26:33 +0000 (10:26 +0300)
author mpv <mpv@opencascade.com>
Fri, 4 Sep 2015 07:26:33 +0000 (10:26 +0300)
committer mpv <mpv@opencascade.com>
Fri, 4 Sep 2015 07:26:33 +0000 (10:26 +0300)
diff --cc src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp
Simple merge
diff --cc src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.h
Simple merge
author	mpv <mpv@opencascade.com>
	Fri, 4 Sep 2015 07:26:33 +0000 (10:26 +0300)
committer	mpv <mpv@opencascade.com>
	Fri, 4 Sep 2015 07:26:33 +0000 (10:26 +0300)
		1	2
src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.h	patch \|	diff1 \|	diff2 \|	blob \| history