]> SALOME platform Git repositories - modules/shaper.git/commit - src/PartSetPlugin/PartSetPlugin_Plugin.h
Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Wed, 23 Apr 2014 14:05:43 +0000 (18:05 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Wed, 23 Apr 2014 14:05:43 +0000 (18:05 +0400)
commitc80e8ac643930b858f4f653e2659896ba587b165
tree8088785b7437984b230dcf4d7619db103c3ec1e3
parente0111b0d9cf5cce201c7bc5616aae4d27624a00b
parent838523560afbec323f8e37dd3ddc6b0bd17da069
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/ModuleBase/ModuleBase_Operation.h
src/PartSet/PartSet_OperationSketchBase.cpp
27 files changed:
CMakeLists.txt
src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
src/GeomAPI/GeomAPI.i
src/GeomAlgoAPI/GeomAlgoAPI.i
src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.cpp
src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
src/Model/CMakeLists.txt
src/Model/Model_Application.cpp
src/Model/Model_AttributeDocRef.cpp
src/Model/Model_Data.cpp
src/Model/Model_Document.cpp
src/Model/Model_Events.cpp
src/Model/Model_Iterator.cpp
src/Model/Model_PluginManager.cpp
src/ModelAPI/ModelAPI_PluginManager.cpp
src/ModuleBase/ModuleBase_Operation.cpp
src/ModuleBase/ModuleBase_Operation.h
src/PartSet/PartSet_OperationSketchBase.cpp
src/PartSetPlugin/PartSetPlugin_Part.cpp
src/PartSetPlugin/PartSetPlugin_Plugin.cpp
src/SketchPlugin/SketchPlugin_Feature.cpp
src/SketchPlugin/SketchPlugin_Feature.h
src/SketchPlugin/SketchPlugin_Sketch.cpp
src/SketchPlugin/SketchPlugin_Sketch.h
src/XGUI/XGUI_Displayer.cpp
src/XGUI/XGUI_Displayer.h
src/XGUI/XGUI_Workshop.cpp