SALOME platform Git repositories - modules/shaper.git/commitdiff

]> SALOME platform Git repositories - modules/shaper.git/commitdiff

author	sbh <sergey.belash@opencascade.com>
	Thu, 12 Feb 2015 14:36:11 +0000 (17:36 +0300)
committer	sbh <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	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

SALOME Shaper module