Merge branch 'master' into 21027_allow_user_to_manually_specify_merge_point
No related branches found
No related tags found
Showing
- Framework/API/CMakeLists.txt 2 additions, 0 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/Algorithm.h 16 additions, 11 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/Algorithm.tcc 26 additions, 15 deletionsFramework/API/inc/MantidAPI/Algorithm.tcc
- Framework/API/inc/MantidAPI/ISpectrum.h 12 additions, 0 deletionsFramework/API/inc/MantidAPI/ISpectrum.h
- Framework/API/inc/MantidAPI/IndexProperty.h 9 additions, 3 deletionsFramework/API/inc/MantidAPI/IndexProperty.h
- Framework/API/inc/MantidAPI/MatrixWorkspace.h 1 addition, 0 deletionsFramework/API/inc/MantidAPI/MatrixWorkspace.h
- Framework/API/inc/MantidAPI/ParallelAlgorithm.h 61 additions, 0 deletionsFramework/API/inc/MantidAPI/ParallelAlgorithm.h
- Framework/API/src/Algorithm.cpp 16 additions, 4 deletionsFramework/API/src/Algorithm.cpp
- Framework/API/src/ISpectrum.cpp 14 additions, 0 deletionsFramework/API/src/ISpectrum.cpp
- Framework/API/src/IndexProperty.cpp 52 additions, 19 deletionsFramework/API/src/IndexProperty.cpp
- Framework/API/src/MatrixWorkspace.cpp 17 additions, 36 deletionsFramework/API/src/MatrixWorkspace.cpp
- Framework/API/src/ParallelAlgorithm.cpp 12 additions, 0 deletionsFramework/API/src/ParallelAlgorithm.cpp
- Framework/API/src/WorkspaceFactory.cpp 2 additions, 0 deletionsFramework/API/src/WorkspaceFactory.cpp
- Framework/API/test/AlgorithmTest.h 15 additions, 9 deletionsFramework/API/test/AlgorithmTest.h
- Framework/API/test/IndexPropertyTest.h 56 additions, 5 deletionsFramework/API/test/IndexPropertyTest.h
- Framework/API/test/MatrixWorkspaceTest.h 10 additions, 0 deletionsFramework/API/test/MatrixWorkspaceTest.h
- Framework/Algorithms/CMakeLists.txt 19 additions, 13 deletionsFramework/Algorithms/CMakeLists.txt
- Framework/Algorithms/inc/MantidAlgorithms/CropWorkspace.h 2 additions, 5 deletionsFramework/Algorithms/inc/MantidAlgorithms/CropWorkspace.h
- Framework/Algorithms/inc/MantidAlgorithms/ExtractSpectra.h 4 additions, 4 deletionsFramework/Algorithms/inc/MantidAlgorithms/ExtractSpectra.h
- Framework/Algorithms/inc/MantidAlgorithms/ExtractSpectra2.h 55 additions, 0 deletionsFramework/Algorithms/inc/MantidAlgorithms/ExtractSpectra2.h
Loading
Please register or sign in to comment