Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Wed, 9 Apr 2014 13:08:33 +0000 (17:08 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Wed, 9 Apr 2014 13:08:33 +0000 (17:08 +0400)
commita142c8797585ec0b35310ec3608d38b3a4908b7c
tree0bb9c256f8b3d393a22ff08e98bb0b60c50c70c7
parentc5a608bb7f2f754085388cd0fa4e3971239f95c5
parent84a820f6440bc98dd413c8e5bd7e476953404a56
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/XGUI/CMakeLists.txt
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_DocumentDataModel.cpp
src/XGUI/XGUI_DocumentDataModel.h
src/XGUI/XGUI_PartDataModel.cpp
src/XGUI/XGUI_PartDataModel.h
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_pictures.qrc
src/XGUI/pictures/point_ico.png