Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

author nds <natalia.donis@opencascade.com>

Tue, 24 Mar 2015 14:10:48 +0000 (17:10 +0300)

committer nds <natalia.donis@opencascade.com>

Tue, 24 Mar 2015 14:10:48 +0000 (17:10 +0300)
author nds <natalia.donis@opencascade.com>
Tue, 24 Mar 2015 14:10:48 +0000 (17:10 +0300)
committer nds <natalia.donis@opencascade.com>
Tue, 24 Mar 2015 14:10:48 +0000 (17:10 +0300)
diff --cc src/PartSet/PartSet_WidgetSketchLabel.cpp
Simple merge
author	nds <natalia.donis@opencascade.com>
	Tue, 24 Mar 2015 14:10:48 +0000 (17:10 +0300)
committer	nds <natalia.donis@opencascade.com>
	Tue, 24 Mar 2015 14:10:48 +0000 (17:10 +0300)