Salome HOME
Merge from V6_main 11/02/2013
authorvsr <vsr@opencascade.com>
Tue, 12 Feb 2013 10:04:45 +0000 (10:04 +0000)
committervsr <vsr@opencascade.com>
Tue, 12 Feb 2013 10:04:45 +0000 (10:04 +0000)
commite4b132cf6375e1f4bc1fef8ce9eb7aaf703e2ffc
treed94b974d3de8d719eb59db85ba780cdc33fec6e3
parent5ab4e9f868874916c91b51f12aa8beacf09f4125
Merge from V6_main 11/02/2013
113 files changed:
adm_local/cmake_files/FindQWT.cmake
adm_local/unix/config_files/check_sip.m4
bin/Makefile.am
build_configure
doc/Makefile.am
doc/salome/Makefile.am
doc/salome/gui/images/icon_about.png
doc/salome/gui/images/notebook1.png
doc/salome/gui/images/studymanagement.png
doc/salome/gui/input/introduction_to_gui.doc
doc/salome/gui/input/study_management_chapter.doc
doc/salome/gui/input/using_notebook.doc
resources/Makefile.am
src/CAF/Makefile.am
src/CAM/CAM_Module.cxx
src/CAM/CAM_Module.h
src/CAM/Makefile.am
src/DDS/DDS_DicGroup.cxx
src/DDS/DDS_DicGroup.h
src/DDS/DDS_DicItem.cxx
src/DDS/DDS_DicItem.h
src/DDS/DDS_Dictionary.cxx
src/DDS/DDS_Dictionary.h
src/DDS/Makefile.am
src/Event/Makefile.am
src/GLViewer/Makefile.am
src/GuiHelpers/StandardApp_Module.cxx
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_Application.h
src/LightApp/LightApp_Module.cxx
src/LightApp/LightApp_Module.h
src/LightApp/LightApp_Study.cxx
src/LightApp/Makefile.am
src/LightApp/resources/LightApp.xml
src/LightApp/resources/LightApp_msg_en.ts
src/LightApp/resources/LightApp_msg_fr.ts
src/LightApp/resources/icon_about.png
src/LightApp/resources/icon_applogo.png
src/LogWindow/Makefile.am
src/OCCViewer/OCCViewer_VService.cxx
src/OCCViewer/OCCViewer_VService.h
src/OCCViewer/OCCViewer_ViewFrame.cxx
src/ObjBrowser/Makefile.am
src/OpenGLUtils/Makefile.am
src/Plot2d/Makefile.am
src/PyConsole/Makefile.am
src/PyConsole/PyConsole_Console.cxx
src/QDS/Makefile.am
src/QDS/QDS_CheckBox.h
src/QDS/QDS_ComboBox.cxx
src/QDS/QDS_ComboBox.h
src/QDS/QDS_Datum.cxx
src/QDS/QDS_Datum.h
src/QDS/QDS_LineEdit.h
src/QDS/QDS_RadioBox.h
src/QDS/QDS_SpinBox.h
src/QDS/QDS_SpinBoxDbl.h
src/QDS/QDS_TextEdit.h
src/Qtx/Makefile.am
src/Qtx/QtxPagePrefMgr.cxx
src/Qtx/QtxWorkstack.cxx
src/Qtx/QtxWorkstack.h
src/SALOME_PY/Makefile.am
src/SALOME_PYQT/Makefile.am
src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx [new file with mode: 0644]
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h [new file with mode: 0644]
src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
src/SALOME_SWIG/Makefile.am
src/SOCC/Makefile.am
src/STD/Makefile.am
src/STD/STD_Application.cxx
src/SUIT/SUIT_DataBrowser.cxx
src/SUIT/SUIT_DataObject.cxx
src/SUIT/SUIT_DataObject.h
src/SUIT/SUIT_Selector.cxx
src/SUIT/SUIT_Selector.h
src/SUIT/SUIT_TreeModel.cxx
src/SUIT/SUIT_TreeModel.h
src/SUITApp/Makefile.am
src/SVTK/SVTK_InteractorStyle.cxx
src/SVTK/SVTK_View.cxx
src/SVTK/SVTK_View.h
src/SalomeApp/CMakeLists.txt
src/SalomeApp/Makefile.am
src/SalomeApp/SalomeApp_Application.cxx
src/SalomeApp/SalomeApp_Application.h
src/SalomeApp/SalomeApp_Module.h
src/SalomeApp/SalomeApp_NoteBook.cxx [new file with mode: 0644]
src/SalomeApp/SalomeApp_NoteBook.h [new file with mode: 0644]
src/SalomeApp/SalomeApp_NoteBookDlg.cxx [deleted file]
src/SalomeApp/SalomeApp_NoteBookDlg.h [deleted file]
src/SalomeApp/SalomeApp_Study.cxx
src/SalomeApp/SalomeApp_Study.h
src/SalomeApp/resources/SalomeApp_msg_en.ts
src/SalomeApp/resources/SalomeApp_msg_fr.ts
src/Session/Makefile.am
src/TOOLSGUI/Makefile.am
src/TreeData/Test/Makefile.am
src/VTKViewer/VTKViewer_Actor.cxx
src/VTKViewer/VTKViewer_Actor.h
src/VTKViewer/VTKViewer_OpenGLRenderer.h
src/VTKViewer/VTKViewer_Texture.h
src/VTKViewer/VTKViewer_Utilities.cxx