Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Tue, 1 Apr 2014 06:15:12 +0000 (10:15 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Tue, 1 Apr 2014 06:15:12 +0000 (10:15 +0400)
commite1f8fb3cfc1ee565db16fbbd9fe6f65121c4577c
treebed2256e7fc370b0faafe803e21a68a193450e11
parent9c985b359361fc2eb4a1b746dcb27031bc2c3c06
parent6f64126a35fdc516fd74651dc55c7b5dfba96f8f
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/XGUI/XGUI_ViewPort.h
src/XGUI/XGUI_ViewWindow.cpp
src/XGUI/XGUI_ViewWindow.h
src/XGUI/XGUI_Viewer.cpp
src/XGUI/XGUI_Viewer.h
src/XGUI/XGUI_ViewPort.cpp
src/XGUI/XGUI_ViewPort.h
src/XGUI/XGUI_ViewWindow.cpp
src/XGUI/XGUI_ViewWindow.h
src/XGUI/XGUI_Viewer.cpp
src/XGUI/XGUI_Viewer.h