]>
SALOME platform Git repositories - modules/shaper.git/commit - src/PartSetPlugin/PartSetPlugin_Duplicate.cpp
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:
