Merge remote-tracking branch 'remotes/origin/master' into SketchSolver

author azv <azv@opencascade.com>

Tue, 1 Jul 2014 06:23:08 +0000 (10:23 +0400)

committer azv <azv@opencascade.com>

Tue, 1 Jul 2014 06:23:08 +0000 (10:23 +0400)
author azv <azv@opencascade.com>
Tue, 1 Jul 2014 06:23:08 +0000 (10:23 +0400)
committer azv <azv@opencascade.com>
Tue, 1 Jul 2014 06:23:08 +0000 (10:23 +0400)
diff --cc src/PartSet/PartSet_Module.cpp
Simple merge
diff --cc src/SketchPlugin/SketchPlugin_Circle.cpp
Simple merge
diff --cc src/SketchPlugin/SketchPlugin_Sketch.cpp
Simple merge
author	azv <azv@opencascade.com>
	Tue, 1 Jul 2014 06:23:08 +0000 (10:23 +0400)
committer	azv <azv@opencascade.com>
	Tue, 1 Jul 2014 06:23:08 +0000 (10:23 +0400)
		1	2
src/PartSet/PartSet_Module.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/SketchPlugin/SketchPlugin_Circle.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/SketchPlugin/SketchPlugin_Sketch.cpp	patch \|	diff1 \|	diff2 \|	blob \| history