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

author azv <azv@opencascade.com>

Thu, 26 Jun 2014 12:34:51 +0000 (16:34 +0400)

committer azv <azv@opencascade.com>

Thu, 26 Jun 2014 12:34:51 +0000 (16:34 +0400)
author azv <azv@opencascade.com>
Thu, 26 Jun 2014 12:34:51 +0000 (16:34 +0400)
committer azv <azv@opencascade.com>
Thu, 26 Jun 2014 12:34:51 +0000 (16:34 +0400)
diff --cc src/PartSet/PartSet_Module.cpp
Simple merge
diff --cc src/PartSet/PartSet_OperationSketch.cpp
Simple merge
diff --cc src/PartSet/PartSet_OperationSketch.h
Simple merge
diff --cc src/PartSet/PartSet_OperationSketchBase.h
Simple merge
author	azv <azv@opencascade.com>
	Thu, 26 Jun 2014 12:34:51 +0000 (16:34 +0400)
committer	azv <azv@opencascade.com>
	Thu, 26 Jun 2014 12:34:51 +0000 (16:34 +0400)
		1	2
src/PartSet/PartSet_Module.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/PartSet/PartSet_OperationSketch.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/PartSet/PartSet_OperationSketch.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/PartSet/PartSet_OperationSketchBase.h	patch \|	diff1 \|	diff2 \|	blob \| history