Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Fri, 4 Apr 2014 08:36:14 +0000 (12:36 +0400)
committersbh <sergey.belash@opencascade.com>
Fri, 4 Apr 2014 08:36:14 +0000 (12:36 +0400)
commit401394b2e312e5c4ecd6a410b90eb2c159a675bf
treee0b6fe11495b9c28a57e917d319160884a64d588
parent196e9b5ccfef56a00ce7764708469685613616c9
parentb313a28b3f3c52537eaffa5924520cc7b1439126
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_MainWindow.cpp
src/XGUI/XGUI_MainWindow.h
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_MainWindow.cpp
src/XGUI/XGUI_MainWindow.h
src/XGUI/XGUI_Workshop.cpp