refs #13989. Fix merge conflicts.
Merge branch 'master' of github.com:mantidproject/mantid into 13989_measurement_info Conflicts: MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h MantidQt/CustomInterfaces/src/QtReflMainView.cpp
No related branches found
No related tags found
Showing
- Code/Mantid/scripts/test/SANSCentreFinderTest.py 0 additions, 270 deletionsCode/Mantid/scripts/test/SANSCentreFinderTest.py
- Framework/API/inc/MantidAPI/ScriptBuilder.h 1 addition, 0 deletionsFramework/API/inc/MantidAPI/ScriptBuilder.h
- Framework/API/src/MatrixWorkspace.cpp 5 additions, 0 deletionsFramework/API/src/MatrixWorkspace.cpp
- Framework/API/src/ScriptBuilder.cpp 31 additions, 5 deletionsFramework/API/src/ScriptBuilder.cpp
- Framework/Algorithms/CMakeLists.txt 8 additions, 4 deletionsFramework/Algorithms/CMakeLists.txt
- Framework/Algorithms/inc/MantidAlgorithms/Comment.h 50 additions, 0 deletionsFramework/Algorithms/inc/MantidAlgorithms/Comment.h
- Framework/Algorithms/inc/MantidAlgorithms/SANSCollimationLengthEstimator.h 2 additions, 0 deletions...hms/inc/MantidAlgorithms/SANSCollimationLengthEstimator.h
- Framework/Algorithms/src/CalculateSlits.cpp 16 additions, 9 deletionsFramework/Algorithms/src/CalculateSlits.cpp
- Framework/Algorithms/src/Comment.cpp 66 additions, 0 deletionsFramework/Algorithms/src/Comment.cpp
- Framework/Algorithms/src/Q1D2.cpp 18 additions, 7 deletionsFramework/Algorithms/src/Q1D2.cpp
- Framework/Algorithms/src/SANSCollimationLengthEstimator.cpp 58 additions, 9 deletionsFramework/Algorithms/src/SANSCollimationLengthEstimator.cpp
- Framework/Algorithms/test/CommentTest.h 64 additions, 0 deletionsFramework/Algorithms/test/CommentTest.h
- Framework/Algorithms/test/Q1D2Test.h 4 additions, 0 deletionsFramework/Algorithms/test/Q1D2Test.h
- Framework/Algorithms/test/SANSCollimationLengthEstimatorTest.h 20 additions, 18 deletions...work/Algorithms/test/SANSCollimationLengthEstimatorTest.h
- Framework/DataHandling/src/LoadFITS.cpp 46 additions, 39 deletionsFramework/DataHandling/src/LoadFITS.cpp
- Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc 9 additions, 0 deletions...rk/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
- Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp 53 additions, 6 deletionsFramework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
- 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 8 additions, 3 deletions...orithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
Loading
Please register or sign in to comment