Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Wed, 24 Sep 2014 11:53:49 +0000 (15:53 +0400)
committersbh <sergey.belash@opencascade.com>
Wed, 24 Sep 2014 11:53:49 +0000 (15:53 +0400)
commitb669a9a22a6cde038878f727af42e3f27e52e0d6
treedfdc000f6c51ee4c86b2385a9058ea62f9f297a8
parent37868f0c69fb4eed9c5545f7e9d639c9a91061a0
parent774726cd9ebb37b6a705cab63cc7938105ed4261
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/SketchPlugin/plugin-Sketch.xml
src/SketchPlugin/plugin-Sketch.xml
src/XGUI/XGUI_Workshop.cpp