]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authorvsv <vitaly.smetannikov@opencascade.com>
Wed, 8 Apr 2015 14:41:53 +0000 (17:41 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Wed, 8 Apr 2015 14:41:53 +0000 (17:41 +0300)
commit91540e31cc99e5f1eef3296b570b65abf580ca85
tree35c9557c3e28ad579d1bff0d7ae76dbe753ba130
parent36a9b277899567c39eeb02fe2e8e510768d4a740
parentc3181094455d7e8f52d887b54dbfb798d4c4d210
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/plugin-Sketch.xml
src/SketchPlugin/plugin-Sketch.xml