Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
authorsbh <sergey.belash@opencascade.com>
Thu, 12 Feb 2015 14:36:11 +0000 (17:36 +0300)
committersbh <sergey.belash@opencascade.com>
Thu, 12 Feb 2015 14:36:11 +0000 (17:36 +0300)
Conflicts:
src/AppElements/AppElements_Command.cpp

1  2 
src/XGUI/XGUI_Workshop.cpp

Simple merge