From: azv <azv@opencascade.com>
Date: Tue, 13 May 2014 05:57:28 +0000 (+0400)
Subject: Merge remote-tracking branch 'remotes/origin/master' into SolveSpace
X-Git-Tag: V_0.2~64^2~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97209b9a0fa0fd1496b96edbdb3100eb771d86c4;p=modules%2Fshaper.git

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

Conflicts:
	src/SketchPlugin/SketchPlugin_Constraint.cpp
	src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
Solution:
	Get local version
---

97209b9a0fa0fd1496b96edbdb3100eb771d86c4