Salome HOME
Merge branch 'V7_dev'
authorvsr <vsr@opencascade.com>
Thu, 24 Mar 2016 11:13:41 +0000 (14:13 +0300)
committervsr <vsr@opencascade.com>
Thu, 24 Mar 2016 12:43:54 +0000 (15:43 +0300)
commitd6bd12111347879cd8dbe1a15ac4d6ba32ce0d6b
tree143b620af666e4bc999c59502e9e82236ca02fe3
parentbd236b88cd42934946ab37fd878586a6c6f8c562
parent11abf4b9333c8945432cca3d7e288dc24a004f42
Merge branch 'V7_dev'
97 files changed:
CMakeLists.txt
SalomeGUIConfig.cmake.in
adm_local/cmake_files/CMakeLists.txt
adm_local/cmake_files/FindSalomeParaView.cmake
adm_local/cmake_files/UsePyQt.cmake
adm_local/cmake_files/UseQtExt.cmake
src/CAF/CMakeLists.txt
src/CAM/CAM_Module.cxx
src/CAM/CAM_Module.h
src/CAM/CMakeLists.txt
src/DDS/CMakeLists.txt
src/GLViewer/CMakeLists.txt
src/GLViewer/GLViewer_BaseObjects.cxx
src/GLViewer/GLViewer_Drawer.cxx
src/GLViewer/GLViewer_ViewPort.cxx
src/GLViewer/GLViewer_Viewer.cxx
src/GLViewer/GLViewer_Viewer2d.cxx
src/GUI_PY/CMakeLists.txt
src/GUI_PY/dockwidgets.py
src/GUI_PY/genericdialog.py
src/GUI_PY/mytestdialog.py
src/GUI_PY/selectvars.py
src/GraphicsView/CMakeLists.txt
src/GuiHelpers/CMakeLists.txt
src/HelpBrowser/CMakeLists.txt
src/LightApp/CMakeLists.txt
src/LightApp/LightApp_Application.cxx
src/LightApp/resources/LightApp.xml
src/LogWindow/CMakeLists.txt
src/OCCViewer/CMakeLists.txt
src/OCCViewer/OCCViewer_ViewPort.cxx
src/OCCViewer/OCCViewer_ViewPort3d.cxx
src/OCCViewer/OCCViewer_ViewSketcher.cxx
src/OCCViewer/OCCViewer_ViewWindow.cxx
src/ObjBrowser/CMakeLists.txt
src/PVViewer/CMakeLists.txt
src/Plot2d/CMakeLists.txt
src/PyConsole/CMakeLists.txt
src/PyEditor/CMakeLists.txt
src/PyInterp/CMakeLists.txt
src/PyViewer/CMakeLists.txt
src/QDS/CMakeLists.txt
src/Qtx/CMakeLists.txt
src/Qtx/QtxAction.cxx
src/Qtx/QtxAction.h
src/Qtx/QtxDialog.cxx
src/Qtx/QtxLogoMgr.cxx
src/Qtx/QtxPopupMgr.cxx
src/Qtx/QtxTranslator.cxx
src/Qtx/QtxTranslator.h
src/Qtx/QtxTreeView.cxx
src/Qtx/QtxWorkspaceAction.cxx
src/Qtx/QtxWorkstack.cxx
src/Qtx/QtxWorkstackAction.cxx
src/QxScene/CMakeLists.txt
src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
src/SOCC/CMakeLists.txt
src/SPlot2d/CMakeLists.txt
src/STD/CMakeLists.txt
src/SUIT/CMakeLists.txt
src/SUIT/SUIT_ActionOperation.cxx
src/SUIT/SUIT_Application.cxx
src/SUIT/SUIT_Application.h
src/SUIT/SUIT_DataBrowser.cxx
src/SUIT/SUIT_FileDlg.cxx
src/SUIT/SUIT_TreeModel.cxx
src/SUITApp/CMakeLists.txt
src/SUITApp/SUITApp.cxx
src/SUITApp/SUITApp_Application.cxx
src/SUITApp/SUITApp_Application.h
src/SVTK/CMakeLists.txt
src/SVTK/SVTK_RenderWindowInteractor.cxx
src/SVTK/SVTK_RenderWindowInteractor.h
src/SVTK/SVTK_SpaceMouse.cxx
src/SVTK/SVTK_SpaceMouse.h
src/SalomeApp/CMakeLists.txt
src/SalomeApp/SalomeApp_ListView.cxx
src/SalomeApp/pluginsdemo/CMakeLists.txt
src/SalomeApp/pluginsdemo/minmax_plugin.py
src/SalomeApp/pluginsdemo/tubedialog.py
src/SalomeApp/pluginsdemo/tubedialog_ui.py
src/SalomeApp/salome_pluginsmanager.py
src/Session/SALOME_Session_Server.cxx
src/Style/CMakeLists.txt
src/Style/Style_Salome.cxx
src/Style/Style_Salome.h
src/TOOLSGUI/CMakeLists.txt
src/TreeData/CMakeLists.txt
src/TreeData/Test/CMakeLists.txt
src/VTKViewer/CMakeLists.txt
src/VTKViewer/VTKViewer_RenderWindow.cxx
src/ViewerTools/CMakeLists.txt
tools/dlgfactory/CMakeLists.txt