]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Fri, 25 Apr 2014 14:02:31 +0000 (18:02 +0400)
committernds <natalia.donis@opencascade.com>
Fri, 25 Apr 2014 14:02:31 +0000 (18:02 +0400)
commite603c0913257c1856bcb07dfcefdd8e918142300
tree95427a3e132e6df4152dd56600d156ae49ad23c6
parent622014f62af50bfd219fb242df168760849e2006
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_Module.cpp
src/XGUI/CMakeLists.txt
src/PartSet/PartSet_Module.cpp