Merge branch 'master' into 14037_Add_icons_to_windows_shortcuts
No related branches found
No related tags found
Showing
- CMakeLists.txt 3 additions, 1 deletionCMakeLists.txt
- Framework/API/inc/MantidAPI/Sample.h 13 additions, 0 deletionsFramework/API/inc/MantidAPI/Sample.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/Sample.cpp 45 additions, 3 deletionsFramework/API/src/Sample.cpp
- Framework/API/src/ScriptBuilder.cpp 31 additions, 5 deletionsFramework/API/src/ScriptBuilder.cpp
- Framework/API/test/SampleTest.h 54 additions, 0 deletionsFramework/API/test/SampleTest.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/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/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
Loading
Please register or sign in to comment