Merge remote-tracking branch 'remotes/origin/SolveSpace'

author azv <azv@opencascade.com>

Mon, 26 May 2014 07:03:18 +0000 (11:03 +0400)

committer azv <azv@opencascade.com>

Mon, 26 May 2014 07:03:18 +0000 (11:03 +0400)
author azv <azv@opencascade.com>
Mon, 26 May 2014 07:03:18 +0000 (11:03 +0400)
committer azv <azv@opencascade.com>
Mon, 26 May 2014 07:03:18 +0000 (11:03 +0400)
diff --cc src/SketchPlugin/SketchPlugin_Sketch.h
Simple merge
author	azv <azv@opencascade.com>
	Mon, 26 May 2014 07:03:18 +0000 (11:03 +0400)
committer	azv <azv@opencascade.com>
	Mon, 26 May 2014 07:03:18 +0000 (11:03 +0400)