Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Fri, 25 Apr 2014 13:41:47 +0000 (17:41 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Fri, 25 Apr 2014 13:41:47 +0000 (17:41 +0400)
commitd4572a0253007ff9fc263253720e37bf896f8d0d
tree9c6053d33bd79fc3d1ab9a83d2e58feb893c377d
parent3950546b72ab1ff2c303c4314e0d2d7574a1629c
parentf05a54dabb8f9aff6b52df72a88160a9be792aee
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/XGUI/XGUI_Workshop.cpp
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h
src/XGUI/XGUI_Workshop.cpp