Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Tue, 29 Apr 2014 07:37:19 +0000 (11:37 +0400)
committersbh <sergey.belash@opencascade.com>
Tue, 29 Apr 2014 07:37:19 +0000 (11:37 +0400)
commitd7ba2128d2350c6cf4af2ac773c7265feac60b1a
treeac1abf82527670f9495b3cfdb8e0974b2e2d8f5c
parentd0128ef99f0d27b41c61eb74770ed6a6cbdf56c9
parent8396394eba586fc212fe4cb3e1e838a54ebf4ffe
Merge branch 'master' of newgeom:newgeom.git

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