Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
authorsbh <sergey.belash@opencascade.com>
Mon, 6 Apr 2015 17:56:37 +0000 (20:56 +0300)
committersbh <sergey.belash@opencascade.com>
Mon, 6 Apr 2015 17:56:37 +0000 (20:56 +0300)
commit33b3a43ad2266cb044e4232c902344842adbba7c
tree8c1bb34e5679a94796ca98a2804f6b77482d0345
parentf845f0d8829b0b04c5e1e552134cefadb1e7249c
parent0e039eb7c484a1a70e435d01f97a9382ed7e3432
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
src/ModelAPI/CMakeLists.txt
src/ModuleBase/ModuleBase_WidgetFactory.cpp
src/Model/Model_Document.cpp
src/ModelAPI/CMakeLists.txt
src/ModuleBase/ModuleBase_WidgetFactory.cpp