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

author nds <natalia.donis@opencascade.com>

Thu, 22 Jan 2015 09:02:58 +0000 (12:02 +0300)

committer nds <natalia.donis@opencascade.com>

Thu, 22 Jan 2015 09:02:58 +0000 (12:02 +0300)
author nds <natalia.donis@opencascade.com>
Thu, 22 Jan 2015 09:02:58 +0000 (12:02 +0300)
committer nds <natalia.donis@opencascade.com>
Thu, 22 Jan 2015 09:02:58 +0000 (12:02 +0300)
diff --cc src/PartSet/PartSet_WidgetPoint2d.cpp
Simple merge
diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge
author	nds <natalia.donis@opencascade.com>
	Thu, 22 Jan 2015 09:02:58 +0000 (12:02 +0300)
committer	nds <natalia.donis@opencascade.com>
	Thu, 22 Jan 2015 09:02:58 +0000 (12:02 +0300)
		1	2
src/PartSet/PartSet_WidgetPoint2d.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/XGUI/XGUI_Workshop.cpp	patch \|	diff1 \|	diff2 \|	blob \| history