Merge remote-tracking branch 'origin/master' into 19500_ISIS_Powder_support_partial_run_selection
Re #19500 Resolved merged conflicts with master
No related branches found
No related tags found
Showing
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- Framework/API/CMakeLists.txt 1 addition, 0 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/CompositeFunction.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/CompositeFunction.h
- Framework/API/src/CompositeFunction.cpp 24 additions, 4 deletionsFramework/API/src/CompositeFunction.cpp
- Framework/API/src/IncreasingAxisValidator.cpp 7 additions, 2 deletionsFramework/API/src/IncreasingAxisValidator.cpp
- Framework/API/src/NumericAxisValidator.cpp 8 additions, 1 deletionFramework/API/src/NumericAxisValidator.cpp
- Framework/API/src/Progress.cpp 1 addition, 1 deletionFramework/API/src/Progress.cpp
- Framework/API/src/SpectraAxisValidator.cpp 8 additions, 1 deletionFramework/API/src/SpectraAxisValidator.cpp
- Framework/API/test/CompositeFunctionTest.h 25 additions, 0 deletionsFramework/API/test/CompositeFunctionTest.h
- Framework/API/test/IncreasingAxisValidatorTest.h 9 additions, 1 deletionFramework/API/test/IncreasingAxisValidatorTest.h
- Framework/API/test/NumericAxisValidatorTest.h 9 additions, 0 deletionsFramework/API/test/NumericAxisValidatorTest.h
- Framework/API/test/ProgressTest.h 22 additions, 0 deletionsFramework/API/test/ProgressTest.h
- Framework/API/test/SpectraAxisValidatorTest.h 9 additions, 0 deletionsFramework/API/test/SpectraAxisValidatorTest.h
- Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmission.h 1 addition, 1 deletion...k/Algorithms/inc/MantidAlgorithms/CalculateTransmission.h
- Framework/Algorithms/src/CalculateMuonAsymmetry.cpp 1 addition, 0 deletionsFramework/Algorithms/src/CalculateMuonAsymmetry.cpp
- Framework/Algorithms/src/CalculateTransmission.cpp 2 additions, 1 deletionFramework/Algorithms/src/CalculateTransmission.cpp
- Framework/Algorithms/src/CreateWorkspace.cpp 14 additions, 8 deletionsFramework/Algorithms/src/CreateWorkspace.cpp
- Framework/Algorithms/src/EstimateMuonAsymmetryFromCounts.cpp 1 addition, 0 deletionsFramework/Algorithms/src/EstimateMuonAsymmetryFromCounts.cpp
- Framework/Algorithms/src/MuonAsymmetryHelper.cpp 1 addition, 1 deletionFramework/Algorithms/src/MuonAsymmetryHelper.cpp
- Framework/Algorithms/src/Qxy.cpp 3 additions, 6 deletionsFramework/Algorithms/src/Qxy.cpp
Loading
Please register or sign in to comment