Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authornds <natalia.donis@opencascade.com>
Tue, 10 Mar 2015 09:08:03 +0000 (12:08 +0300)
committernds <natalia.donis@opencascade.com>
Tue, 10 Mar 2015 09:08:03 +0000 (12:08 +0300)
commitbaa32827d0f7eac19aca82eb41d2aa708b358181
treeb84ae23660c5aa93da744c9cf80c15d9a9026c32
parent396d2182db5324491aae82ba266e853bad5896bb
parent416a42ef199bf4105302e79645ad6334dd74f41b
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.cpp