Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Tue, 29 Apr 2014 06:05:59 +0000 (10:05 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Tue, 29 Apr 2014 06:05:59 +0000 (10:05 +0400)
commit8396394eba586fc212fe4cb3e1e838a54ebf4ffe
treeec2acd12d454e7b976af0ccb4274e56dccc31126
parentaf3e1c3206761f41cbdf56b5ca4da2ac20c62193
parentf3c113af79cf08e90316b2d27303a0a12d93fddc
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.cpp
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h