Salome HOME
Merge from V6_main (04/10/2012)
authorvsr <vsr@opencascade.com>
Mon, 8 Oct 2012 10:44:28 +0000 (10:44 +0000)
committervsr <vsr@opencascade.com>
Mon, 8 Oct 2012 10:44:28 +0000 (10:44 +0000)
commit8c5294030a4c11ca0a18be48fc0165466861adad
treeb1dde0d304d1323ccdefec0d5eedf72f7e82c364
parent731e47a1cac1c7dd304f090953285077010accb7
Merge from V6_main (04/10/2012)
119 files changed:
CMakeLists.txt [new file with mode: 0755]
adm_local/CMakeLists.txt [new file with mode: 0755]
adm_local/cmake_files/CMakeLists.txt [new file with mode: 0755]
adm_local/cmake_files/FindGUI.cmake
adm_local/cmake_files/FindQT4.cmake
adm_local/cmake_files/FindQWT.cmake
adm_local/cmake_files/FindSIPPYQT.cmake
adm_local/cmake_files/UseQT4EXT.cmake
adm_local/unix/CMakeLists.txt [new file with mode: 0755]
adm_local/unix/config_files/CMakeLists.txt [new file with mode: 0755]
bin/CMakeLists.txt [new file with mode: 0755]
doc/CMakeLists.txt [new file with mode: 0755]
doc/salome/CMakeLists.txt [new file with mode: 0755]
doc/salome/gui/CMakeLists.txt [new file with mode: 0755]
doc/salome/gui/images/view2.png
doc/salome/gui/input/index.doc
doc/salome/gui/input/running_salome.doc [deleted file]
doc/salome/gui/input/salome_architecture.doc
doc/salome/gui/input/text_user_interface.doc
doc/salome/tui/CMakeLists.txt [new file with mode: 0755]
idl/CMakeLists.txt [new file with mode: 0755]
resources/CMakeLists.txt [new file with mode: 0755]
src/CAF/CMakeLists.txt [new file with mode: 0755]
src/CAM/CMakeLists.txt [new file with mode: 0755]
src/CASCatch/CMakeLists.txt [new file with mode: 0755]
src/CMakeLists.txt [new file with mode: 0755]
src/DDS/CMakeLists.txt [new file with mode: 0755]
src/Event/CMakeLists.txt [new file with mode: 0755]
src/GLViewer/CMakeLists.txt [new file with mode: 0755]
src/GUI_PY/CMakeLists.txt [new file with mode: 0755]
src/GuiHelpers/CMakeLists.txt [new file with mode: 0755]
src/GuiHelpers/Makefile.am
src/GuiHelpers/QtHelper.hxx
src/GuiHelpers/SALOME_AppStudyEditor.hxx
src/GuiHelpers/SALOME_GuiServices.hxx
src/GuiHelpers/SalomeGuiHelpers.hxx [new file with mode: 0755]
src/GuiHelpers/StandardApp_Module.hxx
src/LightApp/CMakeLists.txt [new file with mode: 0755]
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_DataObject.cxx
src/LightApp/LightApp_PreferencesDlg.cxx
src/LightApp/resources/LightApp.xml
src/LightApp/resources/LightApp_msg_en.ts
src/LightApp/resources/LightApp_msg_fr.ts
src/LogWindow/CMakeLists.txt [new file with mode: 0755]
src/OBJECT/CMakeLists.txt [new file with mode: 0755]
src/OCCViewer/CMakeLists.txt [new file with mode: 0755]
src/OCCViewer/OCCViewer_ViewModel.cxx
src/OCCViewer/OCCViewer_ViewModel.h
src/OCCViewer/OCCViewer_ViewPort3d.cxx
src/OCCViewer/OCCViewer_ViewPort3d.h
src/ObjBrowser/CMakeLists.txt [new file with mode: 0644]
src/OpenGLUtils/CMakeLists.txt [new file with mode: 0755]
src/Plot2d/CMakeLists.txt [new file with mode: 0755]
src/Plot2d/Plot2d_ViewFrame.cxx
src/Plot2d/Plot2d_ViewFrame.h
src/Prs/CMakeLists.txt [new file with mode: 0755]
src/PyConsole/CMakeLists.txt [new file with mode: 0755]
src/PyInterp/CMakeLists.txt [new file with mode: 0755]
src/QDS/CMakeLists.txt [new file with mode: 0755]
src/Qtx/CMakeLists.txt [new file with mode: 0755]
src/Qtx/Qtx.cxx
src/Qtx/QtxBiColorTool.cxx
src/Qtx/QtxBiColorTool.h
src/Qtx/QtxPagePrefMgr.cxx
src/Qtx/QtxPagePrefMgr.h
src/Qtx/QtxResourceMgr.cxx
src/Qtx/QtxTreeView.cxx
src/Qtx/QtxWebBrowser.cxx
src/QxGraph/CMakeLists.txt [new file with mode: 0755]
src/QxScene/CMakeLists.txt [new file with mode: 0755]
src/ResExporter/CMakeLists.txt [new file with mode: 0755]
src/SALOME_PY/CMakeLists.txt [new file with mode: 0755]
src/SALOME_PYQT/CMakeLists.txt [new file with mode: 0755]
src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt [new file with mode: 0755]
src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt [new file with mode: 0755]
src/SALOME_PYQT/SalomePyQt/CMakeLists.txt [new file with mode: 0755]
src/SALOME_SWIG/CMakeLists.txt [new file with mode: 0755]
src/SOCC/CMakeLists.txt [new file with mode: 0755]
src/SPlot2d/CMakeLists.txt [new file with mode: 0755]
src/STD/CMakeLists.txt [new file with mode: 0755]
src/SUIT/CMakeLists.txt [new file with mode: 0644]
src/SUIT/SUIT_PreferenceMgr.cxx
src/SUIT/SUIT_ResourceMgr.cxx
src/SUIT/SUIT_TreeModel.cxx
src/SUITApp/CMakeLists.txt [new file with mode: 0755]
src/SUPERVGraph/CMakeLists.txt [new file with mode: 0755]
src/SVTK/CMakeLists.txt [new file with mode: 0755]
src/SVTK/Makefile.am
src/SVTK/SALOME_Actor.cxx
src/SVTK/SVTK_Actor.cxx
src/SVTK/SVTK_Actor.h
src/SVTK/SVTK_DeviceActor.cxx
src/SVTK/SVTK_DeviceActor.h
src/SVTK/SVTK_Selection.h
src/SVTK/SVTK_Utils.cxx [new file with mode: 0644]
src/SVTK/SVTK_Utils.h [new file with mode: 0644]
src/SalomeApp/CMakeLists.txt [new file with mode: 0755]
src/SalomeApp/Makefile.am
src/SalomeApp/Test/CMakeLists.txt [new file with mode: 0755]
src/SalomeApp/Test/SalomeAppTest.hxx
src/SalomeApp/pluginsdemo/CMakeLists.txt [new file with mode: 0755]
src/Session/CMakeLists.txt [new file with mode: 0755]
src/Session/SALOME_Session_Server.cxx
src/Style/CMakeLists.txt [new file with mode: 0755]
src/TOOLSGUI/CMakeLists.txt [new file with mode: 0755]
src/TreeData/CMakeLists.txt [new file with mode: 0755]
src/TreeData/Test/CMakeLists.txt [new file with mode: 0755]
src/TreeData/Test/data.txt
src/VTKViewer/CMakeLists.txt [new file with mode: 0755]
src/VTKViewer/VTKViewer_MarkerDlg.cxx
src/VTKViewer/VTKViewer_MarkerDlg.h
src/VTKViewer/VTKViewer_MarkerUtils.cxx
src/VTKViewer/VTKViewer_MarkerWidget.cxx
src/VTKViewer/VTKViewer_MarkerWidget.h
src/VTKViewer/VTKViewer_Utilities.cxx
src/ViewerTools/CMakeLists.txt [new file with mode: 0755]
tools/CMakeLists.txt [new file with mode: 0755]
tools/vtkEDFOverloads/CMakeLists.txt [new file with mode: 0755]