Merge branch 'master' of newgeom:newgeom

author vsv <vitaly.smetannikov@opencascade.com>

Wed, 4 Jun 2014 15:29:59 +0000 (19:29 +0400)

committer vsv <vitaly.smetannikov@opencascade.com>

Wed, 4 Jun 2014 15:29:59 +0000 (19:29 +0400)
author vsv <vitaly.smetannikov@opencascade.com>
Wed, 4 Jun 2014 15:29:59 +0000 (19:29 +0400)
committer vsv <vitaly.smetannikov@opencascade.com>
Wed, 4 Jun 2014 15:29:59 +0000 (19:29 +0400)
diff --cc src/ModuleBase/ModuleBase_SelectorWidget.cpp
Simple merge
author	vsv <vitaly.smetannikov@opencascade.com>
	Wed, 4 Jun 2014 15:29:59 +0000 (19:29 +0400)
committer	vsv <vitaly.smetannikov@opencascade.com>
	Wed, 4 Jun 2014 15:29:59 +0000 (19:29 +0400)