]> SALOME platform Git repositories - modules/shaper.git/commit - src/PartSetPlugin/PartSetPlugin_Remove.cpp
Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Wed, 27 Aug 2014 06:58:49 +0000 (10:58 +0400)
committersbh <sergey.belash@opencascade.com>
Wed, 27 Aug 2014 06:58:49 +0000 (10:58 +0400)
commit8dc74f82810d5f597b78633b457efb0ef4f89f9f
tree3a117b3e85893e79bf37f7d8a93f5ca835c6a666
parentcd9217d7e87997ec8bc150a6d8c389e742ca0f84
parentd71b913d3696c4a5c070c0ead5c134c29e244743
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/ModelAPI/ModelAPI_PluginManager.cpp
src/ModelAPI/ModelAPI_PluginManager.cpp