SALOME platform Git repositories - modules/shaper.git/commit - src/PartSetPlugin/PartSetPlugin_Remove.cpp

]> SALOME platform Git repositories - modules/shaper.git/commit - src/PartSetPlugin/PartSetPlugin_Remove.cpp

projects / modules / shaper.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 761f0db 0b636ff)

author	sbh <sergey.belash@opencascade.com>
	Thu, 22 May 2014 09:46:23 +0000 (13:46 +0400)
committer	sbh <sergey.belash@opencascade.com>
	Thu, 22 May 2014 09:46:23 +0000 (13:46 +0400)
commit	503b5444d4a5fa95a3046a754f69f5b79e677e33
tree	6eeee4a0634c3f4ca210e831381f841850c5f5bf	tree \| snapshot
parent	761f0db64165dd5208998f29db8c7a8ae6c30e60	commit \| diff
parent	0b636ffd42324731b8dba44ad3b9ace84a8c5d4f	commit \| diff

Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/XGUI/XGUI_Workshop.h

src/Config/Config_ModuleReader.cpp	diff1 \|	diff2 \|	blob \| history
src/XGUI/XGUI_Workshop.cpp	diff1 \|	diff2 \|	blob \| history
src/XGUI/XGUI_Workshop.h	diff1 \|	diff2 \|	blob \| history

SALOME Shaper module

Copyright © 2005 - 2024 Open CASCADE.
All rights reserved.
Legal Information