Merge remote-tracking branch 'origin/master' into 23697_peak_numbers_combined
Showing
- Framework/LiveData/inc/MantidLiveData/LoadLiveData.h 1 addition, 1 deletionFramework/LiveData/inc/MantidLiveData/LoadLiveData.h
- Framework/LiveData/src/LiveDataAlgorithm.cpp 3 additions, 12 deletionsFramework/LiveData/src/LiveDataAlgorithm.cpp
- Framework/LiveData/src/LoadLiveData.cpp 30 additions, 16 deletionsFramework/LiveData/src/LoadLiveData.cpp
- Framework/LiveData/test/LoadLiveDataTest.h 1 addition, 1 deletionFramework/LiveData/test/LoadLiveDataTest.h
- Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py 17 additions, 10 deletions...ins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
- Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py 28 additions, 0 deletions...algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py
- MantidPlot/CMakeLists.txt 1 addition, 0 deletionsMantidPlot/CMakeLists.txt
- MantidPlot/test/MantidPlotProjectRecovery.py 55 additions, 0 deletionsMantidPlot/test/MantidPlotProjectRecovery.py
- buildconfig/CMake/GNUSetup.cmake 1 addition, 1 deletionbuildconfig/CMake/GNUSetup.cmake
- docs/source/algorithms/LoadLiveData-v1.rst 27 additions, 35 deletionsdocs/source/algorithms/LoadLiveData-v1.rst
- docs/source/release/v3.14.0/framework.rst 1 addition, 1 deletiondocs/source/release/v3.14.0/framework.rst
Loading
Please register or sign in to comment