Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Fri, 25 Apr 2014 14:00:28 +0000 (18:00 +0400)
committernds <natalia.donis@opencascade.com>
Fri, 25 Apr 2014 14:00:28 +0000 (18:00 +0400)
commit622014f62af50bfd219fb242df168760849e2006
treedd6e6db1156436f7a9bf262c7b603b48cb5bcab5
parent0951dd3a93f5370e1b42aef86cccbe0aaa8df0a6
parentd4572a0253007ff9fc263253720e37bf896f8d0d
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_Module.cpp
src/XGUI/CMakeLists.txt
src/PartSet/PartSet_Module.cpp
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_Workshop.cpp