Refs #13314 Fix merge conflicts
No related branches found
No related tags found
Showing
- Code/Mantid/scripts/test/SANSCentreFinderTest.py 270 additions, 0 deletionsCode/Mantid/scripts/test/SANSCentreFinderTest.py
- Framework/API/src/MatrixWorkspace.cpp 5 additions, 0 deletionsFramework/API/src/MatrixWorkspace.cpp
- Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h 2 additions, 2 deletions...tting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
- Framework/CurveFitting/src/Algorithms/SplineSmoothing.cpp 35 additions, 22 deletionsFramework/CurveFitting/src/Algorithms/SplineSmoothing.cpp
- Framework/DataHandling/src/LoadFITS.cpp 46 additions, 39 deletionsFramework/DataHandling/src/LoadFITS.cpp
- Framework/DataHandling/test/LoadSPETest.h 1 addition, 1 deletionFramework/DataHandling/test/LoadSPETest.h
- Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc 9 additions, 0 deletions...rk/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
- Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransposeMD.h 2 additions, 0 deletionsFramework/MDAlgorithms/inc/MantidMDAlgorithms/TransposeMD.h
- Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp 45 additions, 1 deletion...ythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
- Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py 18 additions, 11 deletions...rk/PythonInterface/plugins/algorithms/LRScalingFactors.py
- Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py 6 additions, 0 deletions...orithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
- Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/QLRun.py 361 additions, 0 deletions...nInterface/plugins/algorithms/WorkflowAlgorithms/QLRun.py
- Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py 43 additions, 1 deletion...onInterface/test/python/mantid/api/MatrixWorkspaceTest.py
- Framework/PythonInterface/test/python/plugins/algorithms/ApplyPaalmanPingsCorrectionTest.py 1 addition, 1 deletion...hon/plugins/algorithms/ApplyPaalmanPingsCorrectionTest.py
- Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt 1 addition, 0 deletions...onInterface/test/python/plugins/algorithms/CMakeLists.txt
- Framework/PythonInterface/test/python/plugins/algorithms/QLRunTest.py 185 additions, 0 deletions...thonInterface/test/python/plugins/algorithms/QLRunTest.py
- MantidPlot/src/origin/OPJFile.cpp 10 additions, 26 deletionsMantidPlot/src/origin/OPJFile.cpp
- MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtGUI.ui 1 addition, 1 deletion...tCustomInterfaces/EnggDiffraction/EnggDiffractionQtGUI.ui
- MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h 6 additions, 0 deletions...stomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
- MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui 38 additions, 12 deletions...MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui
Loading
Please register or sign in to comment