Merge remote-tracking branch 'origin/master' into 19500_ISIS_Powder_support_partial_run_selection
Re #19500 Resolved merge conflicts with master
No related branches found
No related tags found
Showing
- Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py 91 additions, 62 deletions...ework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
- Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py 184 additions, 179 deletions...rface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
- Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py 46 additions, 43 deletions...ace/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py
- Framework/PythonInterface/plugins/algorithms/dnsdata.py 9 additions, 8 deletionsFramework/PythonInterface/plugins/algorithms/dnsdata.py
- Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py 60 additions, 1 deletion...rface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
- MantidPlot/src/ApplicationWindow.cpp 25 additions, 30 deletionsMantidPlot/src/ApplicationWindow.cpp
- MantidPlot/src/ApplicationWindow.h 2 additions, 1 deletionMantidPlot/src/ApplicationWindow.h
- MantidPlot/src/ProjectSaveView.cpp 3 additions, 0 deletionsMantidPlot/src/ProjectSaveView.cpp
- MantidPlot/test/squish_test_suites/refl_gui_tests/objects.map 7 additions, 3 deletions...idPlot/test/squish_test_suites/refl_gui_tests/objects.map
- MantidQt/API/inc/MantidQtAPI/MantidQwtWorkspaceData.h 8 additions, 3 deletionsMantidQt/API/inc/MantidQtAPI/MantidQwtWorkspaceData.h
- MantidQt/API/inc/MantidQtAPI/QwtWorkspaceSpectrumData.h 0 additions, 11 deletionsMantidQt/API/inc/MantidQtAPI/QwtWorkspaceSpectrumData.h
- MantidQt/API/src/MantidQwtIMDWorkspaceData.cpp 12 additions, 2 deletionsMantidQt/API/src/MantidQwtIMDWorkspaceData.cpp
- MantidQt/API/src/MantidQwtWorkspaceData.cpp 76 additions, 35 deletionsMantidQt/API/src/MantidQwtWorkspaceData.cpp
- MantidQt/API/src/QwtWorkspaceBinData.cpp 6 additions, 2 deletionsMantidQt/API/src/QwtWorkspaceBinData.cpp
- MantidQt/API/src/QwtWorkspaceSpectrumData.cpp 9 additions, 2 deletionsMantidQt/API/src/QwtWorkspaceSpectrumData.cpp
- MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp 1 addition, 2 deletions...mInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
- MantidQt/CustomInterfaces/src/Indirect/IndirectTab.cpp 4 additions, 4 deletionsMantidQt/CustomInterfaces/src/Indirect/IndirectTab.cpp
- MantidQt/SliceViewer/src/LineViewer.cpp 1 addition, 1 deletionMantidQt/SliceViewer/src/LineViewer.cpp
- Testing/Data/UnitTest/dnstof.d_dat.md5 1 addition, 0 deletionsTesting/Data/UnitTest/dnstof.d_dat.md5
- docs/source/algorithms/LoadDNSLegacy-v1.rst 13 additions, 6 deletionsdocs/source/algorithms/LoadDNSLegacy-v1.rst
Loading
Please register or sign in to comment