]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge remote-tracking branch 'remotes/origin/master' into SolveSpace
authorazv <azv@opencascade.com>
Tue, 20 May 2014 08:16:54 +0000 (12:16 +0400)
committerazv <azv@opencascade.com>
Tue, 20 May 2014 08:16:54 +0000 (12:16 +0400)
commit00e166f80c6501ef008ea4c9a1fd57b8c69f0202
tree6e3d039ac4d880852940270d51f83f69a5500a40
parent404b76982d24707b1f95a05eda3dd1928c850e62
parent118e2ee9b8627855a172fa5ea0aa7945aab48e99
Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

Conflicts:
src/SketchPlugin/SketchPlugin_Feature.cpp
src/SketchPlugin/SketchPlugin_Feature.h
src/PartSet/PartSet_OperationSketchBase.cpp