Merge branch 'master' of newgeom:newgeom.git

author sbh <sergey.belash@opencascade.com>

Thu, 9 Oct 2014 10:15:11 +0000 (14:15 +0400)

committer sbh <sergey.belash@opencascade.com>

Thu, 9 Oct 2014 10:15:11 +0000 (14:15 +0400)
author sbh <sergey.belash@opencascade.com>
Thu, 9 Oct 2014 10:15:11 +0000 (14:15 +0400)
committer sbh <sergey.belash@opencascade.com>
Thu, 9 Oct 2014 10:15:11 +0000 (14:15 +0400)
diff --cc src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
Simple merge
diff --cc src/ModuleBase/ModuleBase_WidgetShapeSelector.h
Simple merge
author	sbh <sergey.belash@opencascade.com>
	Thu, 9 Oct 2014 10:15:11 +0000 (14:15 +0400)
committer	sbh <sergey.belash@opencascade.com>
	Thu, 9 Oct 2014 10:15:11 +0000 (14:15 +0400)
		1	2
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ModuleBase/ModuleBase_WidgetShapeSelector.h	patch \|	diff1 \|	diff2 \|	blob \| history