Salome HOME
Merge branch 'master' of newgeom:newgeom
authormpv <mikhail.ponikarov@opencascade.com>
Wed, 23 Apr 2014 04:23:41 +0000 (08:23 +0400)
committermpv <mikhail.ponikarov@opencascade.com>
Wed, 23 Apr 2014 04:23:41 +0000 (08:23 +0400)
commit69be9f7dcd37595b9b98c9839c77105f2e704def
tree6250773356c95e4cadb6ad50dbfb1fb4f29d808f
parent29b4b1b5e692ebc45e8a27703b9307b075d2cff2
parentf97dbd33987e7bfda12b0962f104cabe7e40b9bd
Merge branch 'master' of newgeom:newgeom

Conflicts:
CMakeLists.txt
src/Config/CMakeLists.txt
src/Config/plugins.xml
src/PartSet/CMakeLists.txt
src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/SketchPlugin_Sketch.cpp
src/SketchPlugin/SketchPlugin_Sketch.h
CMakeLists.txt