Salome HOME
Merge branch 'SALOME-8.2.0_porting'
authorvsv <vitaly.smetannikov@opencascade.com>
Thu, 22 Dec 2016 13:09:03 +0000 (16:09 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Thu, 22 Dec 2016 13:09:03 +0000 (16:09 +0300)
commitc795030a80f70473cfcd9bd1bbe2d65f3b25fb0b
tree84e0fb65ea38fef21775d4e07d804dcc64050a53
parentd5297c3500d8f3ab40d554a6749ddeec0d4871e6
parent12bb2a319b0b314222f3e2605a867b5e7c787849
Merge branch 'SALOME-8.2.0_porting'

Conflicts:
src/SketchPlugin/Test/TestArcBehavior.py
src/XGUI/CMakeLists.txt
src/CollectionPlugin/CMakeLists.txt
src/Model/Model_AttributeSelectionList.cpp
src/SHAPERGUI/SHAPERGUI.cpp
src/XGUI/CMakeLists.txt