Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Fri, 4 Apr 2014 08:39:10 +0000 (12:39 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Fri, 4 Apr 2014 08:39:10 +0000 (12:39 +0400)
commit637bc35625b89379def6b9f9ff0915d32664babd
tree1b68a112dcd45cf059aa1b4ede91de9ba092b465
parent2f228961a2c6c194051d5c839fc678258a457494
parent401394b2e312e5c4ecd6a410b90eb2c159a675bf
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.cpp