]> SALOME platform Git repositories - modules/shaper.git/commit - src/PartSetPlugin/PartSetPlugin.h
Salome HOME
Merge branch 'BR_PYTHON_PLUGIN' of newgeom:newgeom.git into Dev_0.6.1
authorsbh <sergey.belash@opencascade.com>
Mon, 22 Dec 2014 07:21:50 +0000 (10:21 +0300)
committersbh <sergey.belash@opencascade.com>
Mon, 22 Dec 2014 07:21:50 +0000 (10:21 +0300)
commit7bf19255421b34594c7b0a76d0ce28166d0ce895
tree898402b58d9f4b9fddf2b845890983b102b69f6d
parent9e8ad63dcab471641310fd1b594e014ed7121e36
parentdfabc0fdb70f1d5500efd6d7f0177d85f307d40a
Merge branch 'BR_PYTHON_PLUGIN' of newgeom:newgeom.git into Dev_0.6.1

Conflicts:
src/Events/Events_Loop.cpp:
<<<<<<< HEAD
    if (!aWasFlushed)
      myFlushed.erase(myFlushed.find(theID.myID));
=======
    std::set<char*>::iterator anIt = myFlushed.find(theID.myID);
    if (anIt != myFlushed.end()) {
      myFlushed.erase(anIt);
    }
>>>>>>> origin/BR_PYTHON_PLUGIN
src/ModelAPI/ModelAPI.i
src/ModelAPI/ModelAPI_Plugin.h
src/PartSetPlugin/PartSetPlugin_Plugin.h
23 files changed:
CMakeLists.txt
msvc10_env.bat
src/Config/CMakeLists.txt
src/Config/Config_Keywords.h
src/Config/Config_ModuleReader.cpp
src/Config/Config_ModuleReader.h
src/Config/plugins.xml
src/ConstructionPlugin/ConstructionPlugin_Plugin.h
src/Events/Events_Loop.cpp
src/ExchangePlugin/ExchangePlugin_Plugin.h
src/FeaturesPlugin/FeaturesPlugin_Plugin.h
src/GeomAPI/CMakeLists.txt
src/GeomAlgoAPI/CMakeLists.txt
src/GeomDataAPI/CMakeLists.txt
src/Model/Model_Session.cpp
src/Model/Model_Update.cpp
src/ModelAPI/CMakeLists.txt
src/ModelAPI/ModelAPI.i
src/ModelAPI/ModelAPI_AttributeRefAttr.h
src/ModelAPI/ModelAPI_Plugin.h
src/ModelAPI/ModelAPI_Session.cpp
src/ModelAPI/ModelAPI_Session.h
src/SketchPlugin/SketchPlugin_Plugin.h