Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Tue, 24 Jun 2014 08:48:36 +0000 (12:48 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Tue, 24 Jun 2014 08:48:36 +0000 (12:48 +0400)
commitd7e03da669a038a5a47ce8c8d878d8c81cf3faa5
treea067732ca10050f4691ee79a6b0ffdb6cf42f9ee
parent3c6beade1b4575994f2d028b2a42b43d68415fe6
parent1f2a62003cac25a91d8517f3af1940c774f10433
Merge branch 'master' of newgeom:newgeom

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