Merge remote-tracking branch 'origin/master' into powder_reduction_gui_14025
Showing
- Framework/API/inc/MantidAPI/ILatticeFunction.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/ILatticeFunction.h
- Framework/API/inc/MantidAPI/IPawleyFunction.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/IPawleyFunction.h
- Framework/API/inc/MantidAPI/ScriptBuilder.h 1 addition, 0 deletionsFramework/API/inc/MantidAPI/ScriptBuilder.h
- Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/SpectrumDetectorMapping.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/API/test/ILatticeFunctionTest.h 1 addition, 1 deletionFramework/API/test/ILatticeFunctionTest.h
- 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/FilterEvents.h 1 addition, 1 deletionFramework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
- Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h 2 additions, 2 deletionsFramework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h
- Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h 2 additions, 2 deletions...work/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
- Framework/Algorithms/inc/MantidAlgorithms/SANSCollimationLengthEstimator.h 2 additions, 0 deletions...hms/inc/MantidAlgorithms/SANSCollimationLengthEstimator.h
- Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixelCalculator.h 1 addition, 1 deletion...inc/MantidAlgorithms/TOFSANSResolutionByPixelCalculator.h
- Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategy.h 5 additions, 0 deletions...rk/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategy.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/CreateSampleWorkspace.cpp 1 addition, 1 deletionFramework/Algorithms/src/CreateSampleWorkspace.cpp
- Framework/Algorithms/src/CropWorkspace.cpp 4 additions, 2 deletionsFramework/Algorithms/src/CropWorkspace.cpp
- Framework/Algorithms/src/FilterEvents.cpp 34 additions, 32 deletionsFramework/Algorithms/src/FilterEvents.cpp
Loading
Please register or sign in to comment