Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6

author vsv <vitaly.smetannikov@opencascade.com>

Wed, 26 Nov 2014 16:02:04 +0000 (19:02 +0300)

committer vsv <vitaly.smetannikov@opencascade.com>

Wed, 26 Nov 2014 16:02:04 +0000 (19:02 +0300)
author vsv <vitaly.smetannikov@opencascade.com>
Wed, 26 Nov 2014 16:02:04 +0000 (19:02 +0300)
committer vsv <vitaly.smetannikov@opencascade.com>
Wed, 26 Nov 2014 16:02:04 +0000 (19:02 +0300)
diff --cc src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
Simple merge
author	vsv <vitaly.smetannikov@opencascade.com>
	Wed, 26 Nov 2014 16:02:04 +0000 (19:02 +0300)
committer	vsv <vitaly.smetannikov@opencascade.com>
	Wed, 26 Nov 2014 16:02:04 +0000 (19:02 +0300)