Salome HOME
Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6
authorvsv <vitaly.smetannikov@opencascade.com>
Thu, 27 Nov 2014 09:01:18 +0000 (12:01 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Thu, 27 Nov 2014 09:01:18 +0000 (12:01 +0300)
commitefaa3e56c591f0b6a0e018cc91027ff5f82b2438
tree752083093059b3995ab0e8034a15810cddcea3a9
parenteb46781716082e5c57561426894fe4c0c989224e
parent81e0a6c31838fd3f276d6b44ae24a2acc831a8f4
Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6

Conflicts:
src/XGUI/XGUI_PropertyPanel.cpp
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
src/XGUI/XGUI_PropertyPanel.cpp
src/XGUI/XGUI_PropertyPanel.h