From: azv <azv@opencascade.com>
Date: Tue, 20 May 2014 08:16:54 +0000 (+0400)
Subject: Merge remote-tracking branch 'remotes/origin/master' into SolveSpace
X-Git-Tag: V_0.2~29^2^2~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=00e166f80c6501ef008ea4c9a1fd57b8c69f0202;p=modules%2Fshaper.git

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

Conflicts:
	src/SketchPlugin/SketchPlugin_Feature.cpp
	src/SketchPlugin/SketchPlugin_Feature.h
---

00e166f80c6501ef008ea4c9a1fd57b8c69f0202