Merge branch 'master' of newgeom:newgeom

author nds <natalia.donis@opencascade.com>

Fri, 23 May 2014 05:49:05 +0000 (09:49 +0400)

committer nds <natalia.donis@opencascade.com>

Fri, 23 May 2014 05:49:05 +0000 (09:49 +0400)
author nds <natalia.donis@opencascade.com>
Fri, 23 May 2014 05:49:05 +0000 (09:49 +0400)
committer nds <natalia.donis@opencascade.com>
Fri, 23 May 2014 05:49:05 +0000 (09:49 +0400)
diff --cc src/SketchSolver/SketchSolver_ConstraintManager.cpp
Simple merge
author	nds <natalia.donis@opencascade.com>
	Fri, 23 May 2014 05:49:05 +0000 (09:49 +0400)
committer	nds <natalia.donis@opencascade.com>
	Fri, 23 May 2014 05:49:05 +0000 (09:49 +0400)