]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Mon, 5 May 2014 08:58:04 +0000 (12:58 +0400)
committersbh <sergey.belash@opencascade.com>
Mon, 5 May 2014 08:58:04 +0000 (12:58 +0400)
commitab453e930becb984af924565b2bf477628b91be0
treeef4dcd9c86f707094f1444498118a2f140ad9e32
parent2af0a78ca612a60f2a54f1269cea3344d823b400
parent6df60c642d0427e2cb42bd29e2c64d4e5dbdaee4
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/ModuleBase/ModuleBase_WidgetFactory.cpp
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h
src/ModuleBase/CMakeLists.txt
src/ModuleBase/ModuleBase_WidgetFactory.cpp
src/ModuleBase/ModuleBase_WidgetFactory.h
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_OperationMgr.cpp
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h