]> SALOME platform Git repositories - modules/shaper.git/commit - src/Config/Config_Keywords.h
Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Tue, 24 Jun 2014 09:03:02 +0000 (13:03 +0400)
committernds <natalia.donis@opencascade.com>
Tue, 24 Jun 2014 09:03:02 +0000 (13:03 +0400)
commitc3d65a61b0e82724e3211ba475c124472c1de39d
tree994ecfa455b4a76b4b0c04d450788b40672efebd
parent49542ab918c826db5c10abda5be3787937113d94
parentd7e03da669a038a5a47ce8c8d878d8c81cf3faa5
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/Config/Config_Keywords.h
src/ModuleBase/ModuleBase_WidgetFactory.cpp
src/PartSet/PartSet_OperationFeatureCreate.cpp
src/Config/Config_Keywords.h
src/ModuleBase/CMakeLists.txt
src/ModuleBase/ModuleBase_WidgetFactory.cpp
src/ModuleBase/ModuleBase_WidgetFactory.h
src/PartSet/PartSet_OperationFeatureCreate.cpp
src/SketchPlugin/plugin-Sketch.xml