Salome HOME
Merge from V6_main 13/12/2012 BR_KERNEL_REFACTORING V7_1_0_pre
authorvsr <vsr@opencascade.com>
Thu, 13 Dec 2012 08:17:51 +0000 (08:17 +0000)
committervsr <vsr@opencascade.com>
Thu, 13 Dec 2012 08:17:51 +0000 (08:17 +0000)
commit5ab4e9f868874916c91b51f12aa8beacf09f4125
tree5bd9586039365c32891d199620eaba43bb72ef62
parent90b0f6fe027894fd25b7782a21644e0f04672f9d
Merge from V6_main 13/12/2012
68 files changed:
CMakeLists.txt
doc/salome/gui/images/desktop.png [new file with mode: 0644]
doc/salome/gui/images/geomview-alt.png [deleted file]
doc/salome/gui/images/studyproperties.png
doc/salome/gui/input/salome_desktop.doc
doc/salome/gui/input/study_management_chapter.doc
src/CAM/CAM_Application.cxx
src/CAM/CAM_Application.h
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_Application.h
src/LightApp/LightApp_ShowHideOp.cxx
src/LightApp/resources/LightApp.xml
src/OCCViewer/Makefile.am
src/OCCViewer/OCCViewer_ViewFrame.cxx
src/OCCViewer/OCCViewer_ViewFrame.h
src/OCCViewer/OCCViewer_ViewWindow.cxx
src/OCCViewer/OCCViewer_ViewWindow.h
src/OCCViewer/resources/OCCViewer_images.ts
src/OCCViewer/resources/OCCViewer_msg_en.ts
src/OCCViewer/resources/OCCViewer_msg_fr.ts
src/OCCViewer/resources/occ_view_sync.png [deleted file]
src/Plot2d/Plot2d_ViewFrame.cxx
src/Plot2d/Plot2d_ViewFrame.h
src/Qtx/QtxMainWindow.cxx
src/Qtx/QtxMainWindow.h
src/Qtx/QtxPopupMgr.cxx
src/SALOME_PYQT/SalomePyQt/Makefile.am
src/SUIT/CMakeLists.txt
src/SUIT/Makefile.am
src/SUIT/SUIT_CameraProperties.cxx [new file with mode: 0644]
src/SUIT/SUIT_CameraProperties.h [new file with mode: 0644]
src/SUIT/SUIT_ExceptionHandler.cxx
src/SUIT/SUIT_ExceptionHandler.h
src/SUIT/SUIT_ViewWindow.cxx
src/SUIT/SUIT_ViewWindow.h
src/SUIT/resources/SUIT_images.ts
src/SUIT/resources/SUIT_msg_en.ts
src/SUIT/resources/SUIT_msg_fr.ts
src/SUIT/resources/view_sync.png [new file with mode: 0644]
src/SVTK/Makefile.am
src/SVTK/SVTK_ViewWindow.cxx
src/SVTK/SVTK_ViewWindow.h
src/SVTK/resources/SVTK_images.ts
src/SVTK/resources/SVTK_msg_en.ts
src/SVTK/resources/SVTK_msg_fr.ts
src/SVTK/resources/vtk_view_sync.png [deleted file]
src/SalomeApp/CMakeLists.txt
src/SalomeApp/Makefile.am
src/SalomeApp/SalomeApp_Engine_i.cxx [new file with mode: 0644]
src/SalomeApp/SalomeApp_Engine_i.h [new file with mode: 0644]
src/SalomeApp/SalomeApp_Study.cxx
src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
src/SalomeApp/pluginsdemo/salome_plugins.py
src/SalomeApp/resources/SalomeApp.xml
src/SalomeApp/resources/SalomeApp_msg_en.ts
src/SalomeApp/resources/SalomeApp_msg_fr.ts
src/Session/CMakeLists.txt
src/Session/Makefile.am
src/Session/SALOME_Session_Server.cxx
src/Session/SalomeApp_Engine_i.cxx [deleted file]
src/Session/SalomeApp_Engine_i.hxx [deleted file]
src/Session/Session_ServerLauncher.cxx
src/Session/Session_ServerLauncher.hxx
src/Session/Session_ServerThread.cxx
src/Session/Session_ServerThread.hxx
src/TreeData/Test/Makefile.am
src/VTKViewer/VTKViewer_GeometryFilter.cxx