Merge branch 'master' of newgeom:newgeom.git

author sbh <sergey.belash@opencascade.com>

Wed, 24 Sep 2014 11:59:32 +0000 (15:59 +0400)

committer sbh <sergey.belash@opencascade.com>

Wed, 24 Sep 2014 11:59:32 +0000 (15:59 +0400)
author sbh <sergey.belash@opencascade.com>
Wed, 24 Sep 2014 11:59:32 +0000 (15:59 +0400)
committer sbh <sergey.belash@opencascade.com>
Wed, 24 Sep 2014 11:59:32 +0000 (15:59 +0400)
diff --cc src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
Simple merge
author	sbh <sergey.belash@opencascade.com>
	Wed, 24 Sep 2014 11:59:32 +0000 (15:59 +0400)
committer	sbh <sergey.belash@opencascade.com>
	Wed, 24 Sep 2014 11:59:32 +0000 (15:59 +0400)