Merge branch 'Dev_1.1.1' of newgeom:newgeom into Dev_1.2.0

author Sergey POKHODENKO <sergey.pokhodenko@opencascade.com>

Fri, 22 May 2015 13:08:41 +0000 (16:08 +0300)

committer Sergey POKHODENKO <sergey.pokhodenko@opencascade.com>

Fri, 22 May 2015 13:08:41 +0000 (16:08 +0300)
author Sergey POKHODENKO <sergey.pokhodenko@opencascade.com>
Fri, 22 May 2015 13:08:41 +0000 (16:08 +0300)
committer Sergey POKHODENKO <sergey.pokhodenko@opencascade.com>
Fri, 22 May 2015 13:08:41 +0000 (16:08 +0300)
diff --cc src/SketchSolver/SketchSolver_Constraint.cpp
Simple merge
diff --cc src/SketchSolver/SketchSolver_ConstraintCoincidence.cpp
Simple merge
author	Sergey POKHODENKO <sergey.pokhodenko@opencascade.com>
	Fri, 22 May 2015 13:08:41 +0000 (16:08 +0300)
committer	Sergey POKHODENKO <sergey.pokhodenko@opencascade.com>
	Fri, 22 May 2015 13:08:41 +0000 (16:08 +0300)
		1	2
src/SketchSolver/SketchSolver_Constraint.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/SketchSolver/SketchSolver_ConstraintCoincidence.cpp	patch \|	diff1 \|	diff2 \|	blob \| history