Merge branch 'master' of newgeom:newgeom

author nds <natalia.donis@opencascade.com>

Tue, 24 Jun 2014 14:08:33 +0000 (18:08 +0400)

committer nds <natalia.donis@opencascade.com>

Tue, 24 Jun 2014 14:08:33 +0000 (18:08 +0400)
author nds <natalia.donis@opencascade.com>
Tue, 24 Jun 2014 14:08:33 +0000 (18:08 +0400)
committer nds <natalia.donis@opencascade.com>
Tue, 24 Jun 2014 14:08:33 +0000 (18:08 +0400)
diff --cc src/PartSet/PartSet_ConstraintRadiusPrs.cpp
Simple merge
diff --cc src/PartSet/PartSet_ConstraintRadiusPrs.h
Simple merge
author	nds <natalia.donis@opencascade.com>
	Tue, 24 Jun 2014 14:08:33 +0000 (18:08 +0400)
committer	nds <natalia.donis@opencascade.com>
	Tue, 24 Jun 2014 14:08:33 +0000 (18:08 +0400)
		1	2
src/PartSet/PartSet_ConstraintRadiusPrs.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/PartSet/PartSet_ConstraintRadiusPrs.h	patch \|	diff1 \|	diff2 \|	blob \| history