Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Thu, 22 May 2014 09:46:23 +0000 (13:46 +0400)
committersbh <sergey.belash@opencascade.com>
Thu, 22 May 2014 09:46:23 +0000 (13:46 +0400)
commit503b5444d4a5fa95a3046a754f69f5b79e677e33
tree6eeee4a0634c3f4ca210e831381f841850c5f5bf
parent761f0db64165dd5208998f29db8c7a8ae6c30e60
parent0b636ffd42324731b8dba44ad3b9ace84a8c5d4f
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/XGUI/XGUI_Workshop.h
src/Config/Config_ModuleReader.cpp
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h